Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

app.js

@@ -1,4 +1,12 @@
 //app.js
+function splitQueryParams(params) {
+    let tempParams = [];
+    if (Object.keys(params).length <= 0) return tempParams;
+    for (let key in params) {
+        tempParams.push(`${key}=${params[key]}`);
+    }
+    return tempParams.join("&");
+}
 App({
     onLaunch: function () {
         // 展示本地存储能力
@@ -19,14 +27,18 @@ App({
         statusBarHeight: 0, //状态栏高度
         menuRight: 0, //胶囊按钮 距离屏幕右边的距离
         request: function (prarms, callback) {
+            let obj = {
+                version: "1",
+                ...prarms
+            }
             return new Promise((resolve, reject) => {
                 wx.request({
                     url: 'https://cloud.sws010.com/api/v7.ashx',
-                    data: {
-                        version: "1",
-                        ...prarms
+                    header: {
+                        'content-type': 'application/x-www-form-urlencoded' //修改此处即可
                     },
-                    method: 'get',
+                    data: splitQueryParams(obj),
+                    method: 'post',
                     success: function (res) {
                         //接口实际返回的内容在res.data中
                         if (res.data.Code == 1) {
@@ -43,29 +55,7 @@ App({
                     }
                 })
             })
-        },
-        requestMessage: function (params) {
-            return new Promise((resolve, reject) => {
-              wx.request({
-                url: 'http://cloud.sws010.com/api/v7.ashx',
-                data: {
-                  version: "1",
-                  ...params
-                },
-                method: 'get',
-                success: function (res) {
-                    //接口实际返回的内容在res.data中
-                    if (res.data.Code == 1) {
-                      resolve(res.data.Msg);
-                    } else {
-                      reject(res.data)
-                    }
-                },
-                fail: function (err) {
-                  reject(err);
-                }
-              })
-            })
-        },
-    }
+        }
+    },
+  
 })

app.json

@@ -111,7 +111,8 @@
     "van-collapse": "@vant/weapp/collapse/index",
     "van-collapse-item": "@vant/weapp/collapse-item/index",
     "van-tag": "@vant/weapp/tag/index",
-    "van-picker": "@vant/weapp/picker/index"
+    "van-picker": "@vant/weapp/picker/index",
+    "van-nav-bar": "@vant/weapp/nav-bar/index"
   }
   
 }

components/indexCom/eventChild/index.js

@@ -21,7 +21,7 @@ Component({
         toEventDetail(value) {
             let id = value.currentTarget.dataset.id;
             let token = wx.getStorageSync('token') || ''
-            // wx.setStorageSync('sRele', id);
+            wx.setStorageSync('sRele', id);
             if (!token) {
                 wx.navigateTo({
                   url: '/pages/mine/pages/bindUser/index'

pages/brandCrisis/index.js

@@ -31,7 +31,7 @@ Page({
     onShow() {
         if(!wx.getStorageSync('token')) {
             wx.navigateTo({
-              url: '/pages/mine/pages/bindUser/index',
+              url: '/pages/mine/pages/bindUser/index?isHome=1',
             })
             return;
         }
@@ -217,6 +217,7 @@ Page({
     },
     handlerHEvent(e) {
         let row = e.currentTarget.dataset.row;
+        wx.setStorageSync('sRele', row.events_id);
         wx.navigateTo({
             url: "/pages/insight/pages/eventInsight/index" + '?id=' + row.events_id
         })

pages/insight/eventChild/index.js

@@ -10,9 +10,8 @@ Component({
             let id = value.currentTarget.dataset.id;
             wx.setStorageSync('sRele', id);
             wx.navigateTo({
-                url: "/pages/insight/pages/eventInsight/index" + '?id=' + id
+                url: "/pages/insight/pages/eventInsight/index?id=" + id
             })
-            console.log(value)
         }
     },
     lifetimes: {

pages/insight/index.js

@@ -34,7 +34,7 @@ Page({
     onShow() {
         if(!wx.getStorageSync('token')) {
             wx.navigateTo({
-                url: "/pages/mine/pages/bindUser/index",
+                url: "/pages/mine/pages/bindUser/index?isHome=1",
             })
         } else {
             this.getTabBar().init();

pages/insight/pages/brandInsight/TailInsight/index.js

@@ -18,7 +18,7 @@ Component({
     },
     methods: {
         getData() {
-            app.globalData.requestMessage({
+            app.globalData.request({
                 action: 'getWeiYiInsightAnalysis', //尾翼洞察详情
                 token: 't%2BrswgjvzGM=',
                 sType: 'BrandWeiYi',
@@ -26,9 +26,7 @@ Component({
                 sStartTime: wx.getStorageSync('sStartTime') || '',
                 sEndTime: wx.getStorageSync('sEndTime') || '',
                 sBrand: wx.getStorageSync('sBrand') || ''
-            }).then(res => {
-                this.setData({detailData: res});
-            });
+            }, (res) => {this.setData({detailData: res.Msg})}).then(() => {});
             app.globalData.request({
                 action: 'getWeiYiVolumeTime', //尾翼洞察详情
                 token: 't%2BrswgjvzGM=',

pages/insight/pages/brandInsight/TutorInsight/index.js

@@ -16,7 +16,7 @@ Component({
     },
     methods: {
         getData() {
-            app.globalData.requestMessage({
+            app.globalData.request({
                 action: 'getBbsInsightAnalysis', //论坛洞察详情
                 token: 't%2BrswgjvzGM=',
                 sType: 'BbsBrand',
@@ -25,9 +25,7 @@ Component({
                 sEndTime: wx.getStorageSync('sEndTime') || '',
                 sBrand: wx.getStorageSync('sBrand') || '',
                 iBBsType: 1,
-            }).then(res => {
-                this.setData({detailData: res})
-            });
+            }, (res) => {this.setData({detailData: res.Msg})}).then(() => {});
             app.globalData.request({
                 action: 'getBbsCountTime', //论坛传播态势
                 token: 't%2BrswgjvzGM=',

pages/insight/pages/brandInsight/index.js

@@ -50,6 +50,22 @@ Page({
           url: '/pages/insight/pages/brandInsight/brandDataList/index',
         })
     },
+    createReport() {
+        app.globalData.request({
+            action: 'getToPptTask',
+            sType: 'ToBrandPptV6',
+            token: 't%2BrswgjvzGM=',
+            sTimeType: wx.getStorageSync('sTimeType') || 34,
+            sStartTime: wx.getStorageSync('sStartTime') || '',
+            sEndTime: wx.getStorageSync('sEndTime') || '',
+            sBrand: wx.getStorageSync('sBrand') || '',
+        }).then(res => {
+            wx.showModal({
+                title: '数据生成中，请前往”我的“查看生成进度',
+                showCancel: false
+            })
+        });
+    },
     goBack() {
         wx.navigateBack({ delta: 1 })
     },

pages/insight/pages/brandInsight/index.wxml

@@ -5,7 +5,7 @@
             <van-row>
                 <van-col class="tab-btn" bindtap="goBack" span="8"><van-icon name="exchange" /> 切换品牌</van-col>
                 <van-col bindtap="toDataList" class="tab-btn" span="8"><van-icon name="description" /> 数据列表</van-col>
-                <van-col class="tab-btn" span="8"><van-icon name="back-top" /> 生成报告</van-col>
+                <van-col bindtap="createReport" class="tab-btn" span="8"><van-icon name="back-top" /> 生成报告</van-col>
             </van-row>
             <van-divider custom-style="background: linear-gradient(117deg, rgba(245,245,245,0) 0%, #EEEEEE 50%, rgba(232,232,232,0) 100%);" hairline />
             <view class="switch-middle" style="margin-left: 24rpx;">

pages/insight/pages/eventInsight/evDatalist/index.js

@@ -43,7 +43,7 @@ Component({
                 isSourcetype: 0, //1返回渠道 0不返回
                 iTimeType: 0, //0发布时间 1入库时间
                 sCrisis: (this.data.sCrisis).join(','),
-                sRele: this.properties.id,
+                sRele: wx.getStorageSync('sRele') || '',
             }).then(res => {
                 this.setData({dataList: res})
             });

pages/insight/pages/eventInsight/evDatalist/index.wxml

@@ -20,7 +20,7 @@
                 </view>
             </van-dropdown-item>
             <van-dropdown-item id="back" title="更多筛选">
-                返回
+                
             </van-dropdown-item>
         </van-dropdown-menu>
     </view>

pages/insight/pages/eventInsight/evTailwing/index.js

@@ -10,6 +10,9 @@ Component({
         //传播态势
         tailTransChart: singleLine([],[]),
         keyMediaData: histogram([],[],[],'#20CC62'),
+        //热门词云
+        wordCloudActive: 0,
+        wordCloudData: [],
     },
     methods: {
         getData() {
@@ -20,7 +23,7 @@ Component({
                 sTimeType: wx.getStorageSync('sTimeType') || 34,
                 sStartTime: wx.getStorageSync('sStartTime') || '',
                 sEndTime: wx.getStorageSync('sEndTime') || '',
-                sRele: this.properties.id
+                sRele: wx.getStorageSync('sRele') || ''
             }).then(res => {
                 let dx = []; let dValue = [];
                 res.forEach(ele => {
@@ -35,7 +38,7 @@ Component({
                 sTimeType: wx.getStorageSync('sTimeType') || 34,
                 sStartTime: wx.getStorageSync('sStartTime') || '',
                 sEndTime: wx.getStorageSync('sEndTime') || '',
-                sRele: this.properties.id
+                sRele: wx.getStorageSync('sRele') || ''
             }).then(res => {
                 let dx = []; let dValue = [];
                 for(let key in res) {
@@ -44,6 +47,36 @@ Component({
                 }
                 this.setData({ keyMediaData: histogram(dx,dValue,[],'#20CC62')})
             });
+            this.getWordCloud();
+        },
+        getWordCloud() {
+            app.globalData.request({
+                action: this.data.wordCloudActive == 0?'getPositive':'getNegative', // 正面词云 负面词云
+                token: 't%2BrswgjvzGM=',
+                sType: 'HotEvent',
+                sTimeType: wx.getStorageSync('sTimeType') || 34,
+                sStartTime: wx.getStorageSync('sStartTime') || '',
+                sEndTime: wx.getStorageSync('sEndTime') || '',
+                sRele: wx.getStorageSync('sRele') || '',
+            }).then(res => {
+                let arr1 = [];
+                let skey = {
+                    34: 50,
+                    3: 400,
+                    20: 1500,
+                    23: 240
+                };
+                Object.keys(res).forEach(key => {
+                    let o = [key, res[key] / skey[wx.getStorageSync('sTimeType')]]
+                    arr1.push(o)
+                });
+                const resArr = arr1.slice(0,50);
+                this.setData({wordCloudData: resArr})
+            });
+        },
+        changeWordCloud(event) {
+            this.setData({wordCloudActive: event.detail.index});
+            this.getWordCloud()
         }
     },
     lifetimes: {

pages/insight/pages/eventInsight/evTailwing/index.json

@@ -1,6 +1,7 @@
 {
     "usingComponents": {
-        "c-echars": "../../../../../components/c-echars/index"
+        "c-echars": "../../../../../components/c-echars/index",
+        "word-cloud": "../../../../../components/word-cloud/index"
     },
     "component": true
 }

pages/insight/pages/eventInsight/evTailwing/index.wxml

@@ -11,4 +11,18 @@
             <c-echars showChart="{{showChart}}" canvasId="km-canvas" chartId="km" chartOption="{{keyMediaData}}" height="100%"></c-echars>
         </view>
     </view>
+    <view class="evtw-item">
+        <view class="evtw-area-title">
+            <view style="width: 45%;">热门词云</view>
+            <view style="width: 55%;">
+                <van-tabs type="card" active="{{ wordCloudActive }}" color="#BBBBBB" bind:change="changeWordCloud">
+                    <van-tab title="正面"></van-tab>
+                    <van-tab title="负面"></van-tab>
+                </van-tabs>
+            </view>
+        </view>
+        <view class="wd-cloud">
+            <word-cloud canvasId="ta-wc" list="{{wordCloudData}}" width="100%" height="200" color="#FF1C20"></word-cloud>
+        </view>
+    </view>
 </view>

pages/insight/pages/eventInsight/evTailwing/index.wxss

@@ -157,4 +157,24 @@
 }
 .evtw-media-item {
     padding: 24rpx 16rpx 0rpx 32rpx;
+}
+/* 词云 */
+.evtw-area-title {
+    width: 100%;
+    font-size: 18px;
+    padding-left: 32rpx;
+    font-weight: 600;
+    color: #333333;
+    display: flex;
+    justify-content: flex-start;
+}
+.wd-cloud {
+    position: relative;
+    width: calc(100% - 32px);
+    height: 484rpx;
+    background-color: #fff;
+    margin-top: 32rpx;
+    border-radius: 4rpx;
+    padding: 16px;
+    overflow: hidden;
 }

pages/insight/pages/eventInsight/evTotal/index.js

@@ -4,7 +4,9 @@ const dName=['新闻', '论坛','微信', '微博','APP', '短视频', '其他']
 const dColor=['#FF4852','#FF6E25','#FFBF00','#20CC62','#00D6D6','#00AAFF','#7257FF']
 Component({
     properties: {
-        id: String
+        id: {
+            type: String
+        }
     },
     data: {
         showChart: true,
@@ -17,9 +19,12 @@ Component({
         //调性分布态势
         affTransform: brokenLine([],[],[],[]),
         //事件传播历程
-        eventLifetime: [],
+        eventSteps: [],
         //媒体解读
         mediaData: [],
+        //热门词云
+        wordCloudActive: 0,
+        wordCloudData: [],
     },
     methods: {
         getData() {
@@ -30,7 +35,7 @@ Component({
                 sTimeType: wx.getStorageSync('sTimeType') || 34,
                 sStartTime: wx.getStorageSync('sStartTime') || '',
                 sEndTime: wx.getStorageSync('sEndTime') || '',
-                sRele: this.properties.id,
+                sRele: wx.getStorageSync('sRele') || '',
             }).then(res => {
                 let dx = [];
                 let dValue = [[],[],[],[],[],[],[]];
@@ -51,7 +56,7 @@ Component({
                 sTimeType: wx.getStorageSync('sTimeType') || 34,
                 sStartTime: wx.getStorageSync('sStartTime') || '',
                 sEndTime: wx.getStorageSync('sEndTime') || '',
-                sRele: this.properties.id,
+                sRele: wx.getStorageSync('sRele') || '',
             }).then(res => {
                 let arr = [];
                 for(let key in res) {
@@ -67,7 +72,7 @@ Component({
                 sTimeType: wx.getStorageSync('sTimeType') || 34,
                 sStartTime: wx.getStorageSync('sStartTime') || '',
                 sEndTime: wx.getStorageSync('sEndTime') || '',
-                sRele: this.properties.id,
+                sRele: wx.getStorageSync('sRele') || '',
             }).then(res => {
                 let dx = []; let dAff = ['正面','中性','负面'];
                 let dValue = [[],[],[]];
@@ -81,15 +86,25 @@ Component({
                     affTransform: brokenLine(dAff,dValue,dColor,dx)
                 })
             });
-            // app.globalData.request({
-            //     action: 'getEventSpreadProcess0528', //事件传播历程
-            //     token: 't%2BrswgjvzGM=',
-            //     sType: 'HotEvent',
-            //     sTimeType: wx.getStorageSync('sTimeType') || 34,
-            //     sRele: this.properties.id,
-            // }).then(res => {
-            //     console.log(res)
-            // });
+            app.globalData.request({
+                action: 'getEventSpreadProcess0528', //事件传播历程
+                token: 't%2BrswgjvzGM=',
+                sType: 'HotEvent',
+                sTimeType: wx.getStorageSync('sTimeType') || 34,
+                sStartTime: wx.getStorageSync('sStartTime') || '',
+                sEndTime: wx.getStorageSync('sEndTime') || '',
+                sRele: wx.getStorageSync('sRele') || '',
+            }).then(res => {
+                let arr = [];
+                res.forEach(ele => {
+                    let obj = {
+                        text: ele._source.firsttime+' '+ele._source.category,
+                        desc: ele._source.title
+                    };
+                    arr.push(obj);
+                });
+                this.setData({eventSteps: arr})
+            });
             app.globalData.request({
                 action: 'getSource', //媒体解读
                 token: 't%2BrswgjvzGM=',
@@ -97,10 +112,40 @@ Component({
                 sTimeType: wx.getStorageSync('sTimeType') || 34,
                 sStartTime: wx.getStorageSync('sStartTime') || '',
                 sEndTime: wx.getStorageSync('sEndTime') || '',
-                sRele: this.properties.id,
+                sRele: wx.getStorageSync('sRele') || '',
             }).then(res => {
                 this.setData({mediaData: res})
             });
+            this.getWordCloud();
+        },
+        getWordCloud() {
+            app.globalData.request({
+                action: this.data.wordCloudActive == 0?'getHotWord':this.data.wordCloudActive == 1?'getPositive':'getNegative', //热门词云 正面词云 负面词云
+                token: 't%2BrswgjvzGM=',
+                sType: 'HotEvent',
+                sTimeType: wx.getStorageSync('sTimeType') || 34,
+                sStartTime: wx.getStorageSync('sStartTime') || '',
+                sEndTime: wx.getStorageSync('sEndTime') || '',
+                sRele: wx.getStorageSync('sRele') || '',
+            }).then(res => {
+                let arr1 = [];
+                let skey = {
+                    34: 50,
+                    3: 416,
+                    20: 1500,
+                    23: 250
+                };
+                Object.keys(res).forEach(key => {
+                    let o = [key, res[key] / skey[wx.getStorageSync('sTimeType')]]
+                    arr1.push(o)
+                });
+                const resArr = arr1.slice(0,50);
+                this.setData({wordCloudData: resArr})
+            });
+        },
+        changeWordCloud(event) {
+            this.setData({wordCloudActive: event.detail.index});
+            this.getWordCloud()
         }
     },
     lifetimes: {

pages/insight/pages/eventInsight/evTotal/index.json

@@ -1,6 +1,7 @@
 {
     "usingComponents": {
-        "c-echars": "../../../../../components/c-echars/index"
+        "c-echars": "../../../../../components/c-echars/index",
+        "word-cloud": "../../../../../components/word-cloud/index"
     },
     "component": true
 }

pages/insight/pages/eventInsight/evTotal/index.wxml

@@ -5,7 +5,7 @@
             <c-echars showChart="{{showChart}}" canvasId="evt-trans" chartId="evt-transLine" chartOption="{{eventTransform}}" height="100%"></c-echars>
         </view>
     </view>
-    <view class="evt-item" style="height: 824rpx;">
+    <view class="evt-item" style="height: 889rpx;">
         <view class="evt-chart-title">传播重点媒体</view>
         <view class="evt-rank-list">
             <view class="ranking">
@@ -31,6 +31,17 @@
             <c-echars showChart="{{showChart}}" canvasId="evt-trans" chartId="evt-transLine" chartOption="{{affTransform}}" height="100%"></c-echars>
         </view>
     </view>
+    <view class="evt-item">
+        <view class="evt-chart-title">事件传播历程</view>
+        <scroll-view scroll-y class="evt-chart-item" style="height: 600rpx;">
+            <van-steps
+                steps="{{ eventSteps }}"
+                active="{{ eventSteps.length - 1 }}"
+                direction="vertical"
+                desc-class="event-transform-title"
+            />
+        </scroll-view>
+    </view>
     <view class="evt-item">
         <view class="evt-chart-title">媒体解读</view>
         <scroll-view class="evt-chart-item" style="height: 560rpx;" scroll-y>
@@ -40,4 +51,19 @@
             </view>
         </scroll-view>
     </view>
+    <view class="evt-item">
+        <view class="evw-area-title">
+            <view style="width: 40%;">热门词云</view>
+            <view style="width: 60%;">
+                <van-tabs type="card" active="{{ wordCloudActive }}" color="#BBBBBB" bind:change="changeWordCloud">
+                    <van-tab title="热门"></van-tab>
+                    <van-tab title="正面"></van-tab>
+                    <van-tab title="负面"></van-tab>
+                </van-tabs>
+            </view>
+        </view>
+        <view class="wd-cloud">
+            <word-cloud canvasId="ta-wc" list="{{wordCloudData}}" width="100%" height="200" color="#FF1C20"></word-cloud>
+        </view>
+    </view>
 </view>

pages/insight/pages/eventInsight/evTotal/index.wxss

@@ -157,4 +157,30 @@
 }
 .evt-media-item {
     padding: 24rpx 16rpx 0rpx 32rpx;
+}
+/* 词云 */
+.evw-area-title {
+    width: 100%;
+    font-size: 18px;
+    padding-left: 32rpx;
+    font-weight: 600;
+    color: #333333;
+    display: flex;
+    justify-content: flex-start;
+}
+.wd-cloud {
+    position: relative;
+    width: calc(100% - 32px);
+    height: 484rpx;
+    background-color: #fff;
+    margin-top: 32rpx;
+    border-radius: 4rpx;
+    padding: 16px;
+    overflow: hidden;
+}
+.event-transform-title {
+    font-size: 14px;
+    font-weight: 600;
+    color: #333333;
+    margin-top: 24rpx;
 }

pages/insight/pages/eventInsight/evWeibo/index.js

@@ -31,7 +31,7 @@ Component({
                 sTimeType: wx.getStorageSync('sTimeType') || 34,
                 sStartTime: wx.getStorageSync('sStartTime') || '',
                 sEndTime: wx.getStorageSync('sEndTime') || '',
-                sRele: this.properties.id,
+                sRele: wx.getStorageSync('sRele') || '',
             }).then(res => {
                 let total = res.正面 * 1 + res.中性 * 1 + res.负面 * 1;
                 let arr = [];
@@ -48,7 +48,7 @@ Component({
                 sTimeType: wx.getStorageSync('sTimeType') || 34,
                 sStartTime: wx.getStorageSync('sStartTime') || '',
                 sEndTime: wx.getStorageSync('sEndTime') || '',
-                sRele: this.properties.id,
+                sRele: wx.getStorageSync('sRele') || '',
             }).then(res => {
                 let data = res;
                 let getCoreDiffuseWeiBo = data.getCoreDiffuseWeiBo || [];
@@ -86,7 +86,7 @@ Component({
                 sTimeType: wx.getStorageSync('sTimeType') || 34,
                 sStartTime: wx.getStorageSync('sStartTime') || '',
                 sEndTime: wx.getStorageSync('sEndTime') || '',
-                sRele: this.properties.id,
+                sRele: wx.getStorageSync('sRele') || '',
             }).then(res => {
                 let sexTotal = 0; let sexArr = [];
                 if(this.data.weiboUserTabActibe == 0) {
@@ -137,7 +137,7 @@ Component({
                 sTimeType: wx.getStorageSync('sTimeType') || 34,
                 sStartTime: wx.getStorageSync('sStartTime') || '',
                 sEndTime: wx.getStorageSync('sEndTime') || '',
-                sRele: this.properties.id,
+                sRele: wx.getStorageSync('sRele') || '',
                 sQingGan: this.data.kolActive == 0?1:2,
                 iSize: 6
             }).then(res => {

pages/insight/pages/eventInsight/index.js

@@ -12,12 +12,6 @@ Page({
     onShow() {
         this.getData();
     },
-    onLoad(e){
-        this.setData({
-            time:e.time
-        })
-        console.log(this.data.time)
-    },
     getData() {
         app.globalData.request({
             action: 'getEventData',
@@ -42,8 +36,5 @@ Page({
         this.setData({
             tabActive: n
         })
-    },
-    toDataList() {
-        console.log('test')
     }
 })

pages/insight/pages/modalInsight/TailInsight/index.js

@@ -18,7 +18,7 @@ Component({
     },
     methods: {
         getData() {
-            app.globalData.requestMessage({
+            app.globalData.request({
                 action: 'getWeiYiInsightAnalysis', //尾翼洞察详情
                 token: 't%2BrswgjvzGM=',
                 sType: 'BrandWeiYi',
@@ -27,9 +27,7 @@ Component({
                 sEndTime: wx.getStorageSync('sEndTime') || '',
                 sBrand: wx.getStorageSync('sBrand') || '',
                 sSeriesName: wx.getStorageSync('sSeriesName') || '',
-            }).then(res => {
-                this.setData({detailData: res});
-            });
+            }, (res) => {this.setData({detailData: res.Msg})}).then(() => {});
             app.globalData.request({
                 action: 'getWeiYiVolumeTime', //尾翼传播态势
                 token: 't%2BrswgjvzGM=',

pages/insight/pages/modalInsight/index.js

@@ -64,6 +64,23 @@ Page({
           url: '/pages/insight/pages/modalInsight/modalDataList/index',
         })
     },
+    createReport() {
+        app.globalData.request({
+            action: 'getToPptTask',
+            sType: 'ToBrandPptV6',
+            token: 't%2BrswgjvzGM=',
+            sTimeType: wx.getStorageSync('sTimeType') || 34,
+            sStartTime: wx.getStorageSync('sStartTime') || '',
+            sEndTime: wx.getStorageSync('sEndTime') || '',
+            sBrand: this.currentBrand,
+            sSeriesName: wx.getStorageSync('sSeriesName') || '',
+        }).then(res => {
+            wx.showModal({
+                title: '数据生成中，请前往”我的“查看生成进度',
+                showCancel: false
+            }) 
+        });
+    },
     goBack() {
         wx.navigateBack({ delta: 1 })
     },

pages/insight/pages/modalInsight/index.wxml

@@ -5,7 +5,7 @@
             <van-row>
                 <van-col class="tab-btn" bindtap="goBack" span="8"><van-icon name="exchange" /> 切换车型</van-col>
                 <van-col bindtap="toDataList" class="tab-btn" span="8"><van-icon name="description" /> 数据列表</van-col>
-                <van-col class="tab-btn" span="8"><van-icon name="back-top" /> 生成报告</van-col>
+                <van-col bindtap="createReport" class="tab-btn" span="8"><van-icon name="back-top" /> 生成报告</van-col>
             </van-row>
             <van-divider custom-style="background: linear-gradient(117deg, rgba(245,245,245,0) 0%, #EEEEEE 50%, rgba(232,232,232,0) 100%);" hairline />
             <view class="switch-middle" style="margin-left: 24rpx;">

pages/mine/pages/bindUser/index.js

@@ -14,7 +14,9 @@ Page({
         unionID: '',
         code: '',
         nickName: '未登录',
-        avatarUrl: ''
+        avatarUrl: '',
+        statusBarHeight: app.globalData.statusBarHeight,
+        isHome: 0
     },
     usernameInput: function (e) {
         this.setData({
@@ -29,8 +31,13 @@ Page({
     /**
      * 生命周期函数--监听页面加载
      */
-    onLoad(options) {
-        // this.initData() 
+    onLoad() {
+        let pages = getCurrentPages();
+        let currentPage = pages[pages.length - 1]
+        let options = currentPage.options
+        this.setData({
+            isHome: options.isHome || 0
+        })
     },
     // 微信用户初始化
     initData() {
@@ -169,5 +176,20 @@ Page({
                 }
             })
         })
+    },
+    handlerBack() {
+        if(this.data.isHome == 1) {
+            wx.switchTab({
+              url: '/pages/index/index'
+            })
+        } else if(this.data.isHome == 3) {
+            wx.switchTab({
+                url: '/pages/mine/index'
+              })
+        } else {
+            wx.navigateBack({
+                delta: 1
+            });
+        }
     }
 })

pages/mine/pages/bindUser/index.json

@@ -1,5 +1,6 @@
 {
     "usingComponents": {},
+    "navigationStyle": "custom",
     "navigationBarTitleText":"绑定账号",
     "navigationBarBackgroundColor":"#ffffff",
     "navigationBarTextStyle":"black"

pages/mine/pages/bindUser/index.wxml

@@ -1,10 +1,9 @@
 <!--pages/mine/pages/bindUser.wxml-->
-<view class="bind_box" >
+<van-nav-bar custom-class="nav-top" title="账号绑定" left-text="返回" right-text="" left-arrow bind:click-left="handlerBack" />
+<view class="bind_box">
     <view style="font-size:28rpx;font-weight:bolder;margin-left: 32rpx">硕为思账号</view>
-    <input value="{{userName}}" placeholder="请输入账号" placeholder-class="placeholder-style" bindinput="usernameInput" ></input>
-    <view style="font-size:28rpx;font-weight:bolder;margin-top: 32rpx;margin-left: 32rpx"
-    >密码</view>
-    <input value="{{pwd}}" placeholder="请输入密码"  placeholder-class="placeholder-style" type="password" bindinput="passwordInput"></input>
-    <button  bindtap="login"
-    class="bts" bindtap="login">立即绑定</button>
-</view>
+    <input value="{{userName}}" placeholder="请输入账号" placeholder-class="placeholder-style" bindinput="usernameInput"></input>
+    <view style="font-size:28rpx;font-weight:bolder;margin-top: 32rpx;margin-left: 32rpx">密码</view>
+    <input value="{{pwd}}" placeholder="请输入密码" placeholder-class="placeholder-style" type="password" bindinput="passwordInput"></input>
+    <button bindtap="login" class="bts" bindtap="login">立即绑定</button>
+</view>

pages/mine/pages/bindUser/index.wxss

@@ -34,4 +34,18 @@ page{
     font-size: 28rpx;
     height: 88rpx;
     line-height: 88rpx;
-}
+}
+.bs-top-title {
+    position: relative;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: #fff;
+    font-size: 26rpx;
+    height: 40px;
+}
+.bs-top-title-ic {
+    position: absolute;
+    left: 16px;
+    font-size: 19px;
+}

pages/mine/pages/helpCenter/index.js

@@ -1,13 +1,15 @@
 // pages/mine/pages/helpCenter/index.js
+const app = getApp()
 Page({
 
     /**
      * 页面的初始数据
      */
     data: {
-        fileList:[],
+        fileList: [],
         mobile: '',
-        content: ''
+        content: '',
+        base64: ''
     },
     /**
      * 生命周期函数--监听页面加载
@@ -20,9 +22,9 @@ Page({
      * 生命周期函数--监听页面显示
      */
     onShow() {
-        if(!wx.getStorageSync('token')) {
+        if (!wx.getStorageSync('token')) {
             wx.navigateTo({
-                url: '/pages/mine/pages/bindUser/index',
+                url: '/pages/mine/pages/bindUser/index?isHome=3',
             })
             return;
         }
@@ -33,23 +35,77 @@ Page({
         })
     },
     phoneInput(e) {
+        let value = this.validateNumber(e.detail.value);
         this.setData({
-            mobile: e.detail.value
+            mobile: value
         })
     },
+    validateNumber(val) {
+        return val.replace(/\D/g, '')
+    },
     afterRead(event) {
-        const { file } = event.detail;
-        wx.uploadFile({
-            url: 'https://example.weixin.qq.com/upload', // 仅为示例，非真实的接口地址
-            filePath: file.url,
-            name: 'file',
-            formData: { user: 'test' },
-            success(res) {
-              // 上传完成需要更新 fileList
-              const { fileList = [] } = this.data;
-              fileList.push({ ...file, url: res.data });
-              this.setData({ fileList });
-            },
-          });
+        const {
+            file
+        } = event.detail;
+        let url = file.url;
+        let base64 = wx.getFileSystemManager().readFileSync(url, "base64");
+        this.setData({
+            base64: base64,
+            fileList: [{url: url}]
+        });
+    },
+    delImage(event) {
+        let index= event.detail.index;
+        this.setData({
+            base64: '',
+            fileList: []
+        }); 
+    },
+    isPoneAvailable(str) {
+        var myreg = /^[1][2,3,4,5,6,7,8,9][0-9]{9}$/;
+        if (!myreg.test(str)) {
+            return false;
+        } else {
+            return true;
+        }
+    },
+    submit() {
+        let that = this;
+        if(!this.isPoneAvailable(this.data.mobile)) {
+            wx.showModal({
+                title: '提示',
+                content: '请输入正确的手机号',
+            })
+            return
+        }
+        if(!this.data.content) {
+            wx.showModal({
+                title: '提示',
+                content: '请输入问题描述',
+            }) 
+            return
+        }
+        let obj = {
+            action: 'suggest',
+            token: wx.getStorageSync('token'),
+            content: this.data.content,
+            mobile: this.data.mobile,
+            base64: this.data.base64
+        }
+        app.globalData.request(obj).then(() => {
+            wx.showModal({
+                title: '提示',
+                content: '提交成功！',
+                success(res) {
+                    if(res.confirm) {
+                        wx.navigateBack({
+                            delta: 1
+                        });
+                    } else {
+                        //
+                    }
+                }
+            })
+        })
     }
 })

pages/mine/pages/helpCenter/index.wxml

@@ -2,10 +2,10 @@
 <view style="margin-top:32rpx;margin-left:32rpx;font-size: 28rpx; font-weight: bold;">问题描述</view>
 <view class="center">
     <textarea value="{{content}}" placeholder="请输入您的问题并上传页面截屏可帮助技术人员更快地解决问题" placeholder-class="placeholder-style" bindinput="contentInput"></textarea>
-    <view style="margin-left:32rpx">
-        <van-uploader accept="image" file-list="{{ fileList }}" bind:after-read="afterRead" />
+    <view style="margin-left:32rpx; margin-top: 20rpx;">
+        <van-uploader accept="image" deletable="{{true}}" max-count="1" file-list="{{ fileList }}" bind:after-read="afterRead" bind:delete="delImage" />
     </view>
 </view>
 <view style="margin-top:32rpx;margin-left:32rpx;font-size: 28rpx; font-weight: bold;">联系方式</view>
 <input type="text" value="{{mobile}}" placeholder="请输入您的手机号码方便联系" placeholder-class="placeholder-style2" bindinput="phoneInput"/>
-<button>提交</button>
+<button bindtap="submit">提交</button>

pages/mine/pages/helpCenter/index.wxss

@@ -3,11 +3,11 @@ page{
     background: #f6f6f6;
 }
 .center{
-    height: 488rpx;
     background: white;
     width: 100%;
     margin-top: 24rpx;
     padding-top: 32rpx;
+    padding-bottom: 10rpx;
 }
 .center textarea{
     /* background: pink; */

pages/mine/pages/myReport/index.js

@@ -36,7 +36,7 @@ Page({
         iPageIndex = 1;
         if(!wx.getStorageSync('token')) {
             wx.navigateTo({
-                url: '/pages/mine/pages/bindUser/index',
+                url: '/pages/mine/pages/bindUser/index?isHome=3',
             })
             return;
         }