cxw-010203

pages/brandCrisis/chooseModel/index.js

@@ -53,7 +53,7 @@ Page({
     save() {
         wx.setStorageSync("sSeriesArr", this.data.result.toString()); 
         wx.redirectTo({
-            url: '/pages/brandCrisis/crisiSet/index'
+            url: '/pages/brandCrisis/crisiSet/index?brand=' + this.data.brand 
         }) 
     }
 })

pages/brandCrisis/crisiSet/index.js

@@ -19,10 +19,6 @@ Page({
         })
     },
     onShow() {
-        let sSeriesName = wx.getStorageSync("sSeriesArr") || '';
-        this.setData({
-            sSeriesName: sSeriesName,
-        })
         this.getSwsQyQuartz()
     },
     getSwsQyQuartz() {
@@ -31,19 +27,24 @@ Page({
             pid: 'brand',
             token: wx.getStorageSync('token') || 't%2BrswgjvzGM='
         }
+       let setBrand =  wx.getStorageSync("setBrand"); 
+       if(this.data.brand != setBrand) {
+            wx.setStorageSync("sSeriesArr", ''); 
+       }
         app.globalData.request(obj).then(res => {
             let data = res[0];
             let Es = data.Es || {};
             let Id = data.Id || "";
             let crisis = Es.Crisis ? Es.Crisis.split(",") : [];
-            let seriesNames = Es.SeriesNames || ''
+            let seriesNames = wx.getStorageSync("sSeriesArr") || '';
             let checked = data.Statu == 1 ? false : true
             this.setData({
                 Id: Id,
-                result: crisis,
+                result: this.data.brand == Es.Brands ?  crisis : [],
-                sSeriesName: this.data.sSeriesName || seriesNames,
+                sSeriesName: seriesNames,
-                checked: checked
+                checked: this.data.brand == Es.Brands ? checked : false
             })
+            wx.setStorageSync("setBrand", this.data.brand);
         })
     },
     onChange(event) {
@@ -80,6 +81,9 @@ Page({
     },
     save() {
         let data = {
+            action: "addOrUpdSwsQyQuartzList",
+            token: wx.getStorageSync('token') || 't%2BrswgjvzGM=',
+            data: {
                 Id: this.data.Id,
                 Es: {
                     Brands: this.data.brand,
@@ -87,10 +91,9 @@ Page({
                     SeriesNames: this.data.sSeriesName
                 }
             }  
-        app.globalData.request({
+        }
-            action: "addOrUpdSwsQyQuartzList",
+        app.globalData.request(data).then(() => {
-            data: data,
+            wx.setStorageSync("setBrand", this.data.brand); 
-            token: wx.getStorageSync('token') || 't%2BrswgjvzGM='
         })
     },
 })

pages/brandCrisis/index.js

@@ -63,9 +63,6 @@ Page({
                 openid: wx.getStorageSync('openid'),
                 token: wx.getStorageSync('token') || 't%2BrswgjvzGM='
             }).then(res => {
-                this.setData({
-                    sBrand: res.brandname
-                })
                 resolve(res.brandname)
             }).catch(() => {
                 reject(false)
@@ -81,7 +78,7 @@ Page({
             action: "getHealthIndex",
             sType: "BrandOverview",
             sTimeType: sTimeType,
-            sBrand: this.data.sBrand,
+            sBrand: this.data.headlBrand,
             sStartTime: sStartTime,
             sEndTime: sEndTime,
             // sSeriesName: sSeriesName,
@@ -145,7 +142,7 @@ Page({
             iPageSize: 5,
             sType: "BrandData",
             sCrisis: sCrisis,
-            sBrand: this.data.sBrand,
+            sBrand: this.data.headlBrand,
             // sSeriesName: sSeriesName,
             token: wx.getStorageSync('token') || 't%2BrswgjvzGM='
         }
@@ -170,7 +167,7 @@ Page({
             iPageIndex: 1,
             iPageSize: 5,
             sTimeType: sTimeType,
-            sBrand: this.data.sBrand,
+            sBrand: this.data.headlBrand,
             sStartTime: sStartTime,
             sEndTime: sEndTime,
             // sSeriesName: sSeriesName,
@@ -197,7 +194,7 @@ Page({
             sTimeType: sTimeType,
             sStartTime: sStartTime,
             sEndTime: sEndTime,
-            sBrand: this.data.sBrand,
+            sBrand: this.data.headlBrand,
             // sSeriesName: sSeriesName,
             token: wx.getStorageSync('token') || 't%2BrswgjvzGM='
         }
@@ -231,12 +228,12 @@ Page({
     },
     handlerSet() {
         wx.navigateTo({
-            url: '/pages/brandCrisis/crisiSet/index?brand=' + this.data.sBrand
+            url: '/pages/brandCrisis/crisiSet/index?brand=' + this.data.headlBrand
         })
     },
     handlerGoList() {
         wx.navigateTo({
-            url: '/pages/brandCrisis/crisisList/index?brand=' + this.data.sBrand
+            url: '/pages/brandCrisis/crisisList/index?brand=' + this.data.headlBrand
         })
     }
 })