diff --git a/contrastPackages/eventRatio/survey/index.wxml b/contrastPackages/eventRatio/survey/index.wxml
index 96048fe..dc19a0f 100644
--- a/contrastPackages/eventRatio/survey/index.wxml
+++ b/contrastPackages/eventRatio/survey/index.wxml
@@ -6,7 +6,7 @@
 </view>
 <view class="event_distribution">
     <view class="chart_title">事件调性分布</view>
-    <view style="width: 100%;display: flex; justify-content: space-between;" >
+    <view style="width: 100%;display: flex;" >
         <view class="table_pie">
         <view style="margin-left:32rpx;font-size: 32rpx;"> 事件一</view>
         <c-echars showChart="{{showChart}}" canvasId="wbtype-canvas" chartId="wbtype" chartOption="{{eventDist[0].func}}" height="100%"></c-echars>
diff --git a/contrastPackages/eventRatio/survey/index.wxss b/contrastPackages/eventRatio/survey/index.wxss
index c4b4688..6b0267b 100644
--- a/contrastPackages/eventRatio/survey/index.wxss
+++ b/contrastPackages/eventRatio/survey/index.wxss
@@ -78,8 +78,8 @@
 }
 .event_distribution{
     height: 894rpx;
-    padding-top:32rpx ;
-    width: 686rpx;
+    padding:32rpx;
+    width: calc(100% - 32px);
     background: #ffffff;
     margin-top: 28rpx;
 }
diff --git a/contrastPackages/eventRatio/weibo/index.wxml b/contrastPackages/eventRatio/weibo/index.wxml
index 73b92f9..dab464f 100644
--- a/contrastPackages/eventRatio/weibo/index.wxml
+++ b/contrastPackages/eventRatio/weibo/index.wxml
@@ -20,7 +20,7 @@
 </view>
 
 <view class="event_distribution">
-    <view class="chart_title">事件调性分布</view>
+    <view class="chart_title1">事件调性分布</view>
     <view style="width: 100%;display: flex; justify-content: space-between;" >
         <view class="table_pie">
         <view style="margin-left:32rpx;font-size: 32rpx;"> 事件一</view>
@@ -84,7 +84,7 @@
     </view>
 </view>
 <view class="event_distribution" style="margin-top:36rpx;">
-    <view class="chart_title">微博用户性别对比</view>
+    <view class="chart_title1">微博用户性别对比</view>
     <view style="width: 100%;display: flex; justify-content: space-between;" >
         <view class="table_pie">
         <view style="margin-left:32rpx;font-size: 32rpx;"> 事件一</view>
@@ -133,7 +133,7 @@
 
 
 <view class="event_distribution">
-    <view class="chart_title">微博认证用户对比</view>
+    <view class="chart_title1">微博认证用户对比</view>
     <view style="width: 100%;display: flex; justify-content: space-between;" >
         <view class="table_pie">
         <view style="margin-left:32rpx;font-size: 32rpx;"> 事件一</view>
diff --git a/contrastPackages/eventRatio/weibo/index.wxss b/contrastPackages/eventRatio/weibo/index.wxss
index 2fe54c6..993f758 100644
--- a/contrastPackages/eventRatio/weibo/index.wxss
+++ b/contrastPackages/eventRatio/weibo/index.wxss
@@ -1,28 +1,35 @@
-.chart_box{
+.chart_box {
     margin-top: 24rpx;
     width: 686rpx;
     height: 468rpx;
-    padding-top:32rpx ;
+    padding-top: 32rpx;
     background: white;
 }
-.chart_title{
-  font-size: 18px;
-    margin-left:32rpx ;
+
+.chart_title {
+    font-size: 18px;
+    margin-left: 32rpx;
 }
-.table{
-    height: 380rpx; 
+.chart_title1 {
+    font-size: 18px;
+}
+
+.table {
+    height: 380rpx;
     width: 95%;
-    margin-left:16rpx ;
+    margin-left: 16rpx;
     margin-top: 32rpx;
 }
-.top_box{
+
+.top_box {
     margin-top: 24rpx;
     width: 686rpx;
     height: 1312rpx;
-    background:#ffffff;
+    background: #ffffff;
     border-radius: 8rpx;
-    padding-top:32rpx;
+    padding-top: 32rpx;
 }
+
 .top-title {
     width: 100%;
     font-size: 18px;
@@ -32,31 +39,38 @@
     display: flex;
     justify-content: flex-start;
 }
-.rank_list{
+
+.rank_list {
     margin-left: 32rpx;
     margin-top: 16rpx;
 }
-.ranking{
+
+.ranking {
     font-size: 12px;
     font-weight: 400;
     color: #999999;
 }
-.ranking_cell{
+
+.ranking_cell {
     height: 104rpx;
-    display: flex ; align-items: center;
+    display: flex;
+    align-items: center;
 }
-.henxian{
+
+.henxian {
     height: 2rpx;
-   background:linear-gradient(to right,white, #f2f1f1,white);
+    background: linear-gradient(to right, white, #f2f1f1, white);
 }
-.cloud_box{
+
+.cloud_box {
     margin-top: 24rpx;
     width: 686rpx;
     height: 884rpx;
-    background:#ffffff;
+    background: #ffffff;
     border-radius: 8rpx;
-    padding-top:32rpx;
+    padding-top: 32rpx;
 }
+
 .cloud_title {
     width: 100%;
     font-size: 18px;
@@ -66,31 +80,36 @@
     display: flex;
     justify-content: flex-start;
 }
-.area_box{
+
+.area_box {
     margin-top: 24rpx;
     width: 686rpx;
     /* height: 100%; */
-    background:#ffffff;
+    background: #ffffff;
     border-radius: 8rpx;
-    padding:32rpx 0;
+    padding: 32rpx 0;
 }
-.event_distribution{
+
+.event_distribution {
     height: 900rpx;
-    padding-top:32rpx ;
-    width: 686rpx;
+    padding: 32rpx;
+    width: calc(100% - 32px);
     background: #ffffff;
     margin-top: 28rpx;
 }
+
 .circle-data {
     width: 50%;
     height: 340rpx;
 }
+
 .circle-data-item {
     color: #999999;
     font-size: 10px;
     line-height: 12px;
     width: 33%;
 }
+
 .circle-data-title {
     font-size: 12px;
     /* font-weight: 600; */
@@ -101,12 +120,16 @@
     overflow: hidden;
     white-space: nowrap;
 }
-.table_pie{
-    height: 380rpx; 
+
+.table_pie {
+    height: 380rpx;
     width: 60%;
     /* margin-left:16rpx ; */
     margin-top: 32rpx;
 }
+
 .colorTags {
-    width: 10px;height: 10px;border-radius: 1px;
+    width: 10px;
+    height: 10px;
+    border-radius: 1px;
 }
\ No newline at end of file
diff --git a/pages/insight/pages/addTheme/index.js b/pages/insight/pages/addTheme/index.js
index 49d3676..2d4d1c9 100644
--- a/pages/insight/pages/addTheme/index.js
+++ b/pages/insight/pages/addTheme/index.js
@@ -356,8 +356,8 @@ Page({
     if (Statu == 0) {
       let dtData = {
         "AnalyzeWord": this.data.totalMode == 1 ? this.data.highAnalizeWord.replace("+","%2B") : this.data.AnalyzeWord.replace("+","%2B"),
-        "HuoWord": this.data.HuoWord,
-        "PaiChu": this.data.PaiChu,
+        "HuoWord": this.data.HuoWord.replace("+","%2B"),
+        "PaiChu": this.data.PaiChu.replace("+","%2B"),
         "IsAdvancedQuery": this.data.totalMode == 0 && this.data.currWordType == '必选词和的关系' ? 0 : this.data.totalMode == 1 ? 1 : 2,
         "Source": this.data.Source,
         "UserAuthor": this.data.UserAuthor
@@ -385,8 +385,8 @@ Page({
     }else{
       let dtData = {
         "AnalyzeWord": this.data.totalMode == 1 ? this.data.highAnalizeWord.replace("+","%2B") : this.data.AnalyzeWord.replace("+","%2B"),
-        "HuoWord": this.data.HuoWord,
-        "PaiChu": this.data.PaiChu,
+        "HuoWord": this.data.HuoWord.replace("+","%2B"),
+        "PaiChu": this.data.PaiChu.replace("+","%2B"),
         "IsAdvancedQuery": this.data.totalMode == 0 && this.data.currWordType == '必选词和的关系' ? 0 : this.data.totalMode == 1 ? 1 : 2,
         "Source": this.data.Source,
         "UserAuthor": this.data.UserAuthor
diff --git a/pages/insight/pages/editTheme/index.js b/pages/insight/pages/editTheme/index.js
index 35df17c..c965f94 100644
--- a/pages/insight/pages/editTheme/index.js
+++ b/pages/insight/pages/editTheme/index.js
@@ -81,7 +81,7 @@ Page({
                 isSelect: false
             }
         ],
-        show:false
+        show: false
     },
     onLoad: function (options) {
         this.setData({
@@ -96,26 +96,49 @@ Page({
             Guids: this.data.Guid,
         }).then(res => {
             // todo: 回显预警信息
-            let warning = res.Warning.Es || {};
-            let that = this;
-            let qudaos = warning.QuDao == ""?[]:warning.QuDao.split(',');
-            let crisises = warning.Crisis == ""?[]:warning.Crisis.split(',');
-            let qinggans = warning.QingGan == ""?[]:warning.QingGan.split(',');
-            crisises.forEach(ele => {
-              console.log('vcfx',crisises)
-                that.data.wjList[ele-1].isSelect = !that.data.wjList[ele-1].isSelect
-            });
-            qinggans.forEach(ele => {
-                that.data.qgList[ele-1].isSelect = !that.data.qgList[ele-1].isSelect
-            });
-            qudaos.forEach(ele => {
-                that.data.affList[ele].isSelect = !that.data.affList[ele].isSelect
-            });
-            this.setData({
-                qgList: that.data.qgList,
-                wjList: that.data.wjList,
-                affList:that.data.affList,
-            });
+            if (typeof (res.Warning.Es) == "string") {
+                let warning = JSON.parse(res.Warning.Es);
+                let that = this;
+                let qudaos = warning.QuDao == "" ? [] : warning.QuDao.split(',');
+                let crisises = warning.Crisis == "" ? [] : warning.Crisis.split(',');
+                let qinggans = warning.QingGan == "" ? [] : warning.QingGan.split(',');
+                crisises.forEach(ele => {
+                    that.data.wjList[ele - 1].isSelect = !that.data.wjList[ele - 1].isSelect
+                });
+                qinggans.forEach(ele => {
+                    that.data.qgList[ele - 1].isSelect = !that.data.qgList[ele - 1].isSelect
+                });
+                qudaos.forEach(ele => {
+                    that.data.affList[ele].isSelect = !that.data.affList[ele].isSelect
+                });
+                this.setData({
+                    qgList: that.data.qgList,
+                    wjList: that.data.wjList,
+                    affList: that.data.affList,
+                });
+            } else {
+                let warning = res.Warning.Es || {};
+                let that = this;
+                let qudaos = warning.QuDao == "" ? [] : warning.QuDao.split(',');
+                let crisises = warning.Crisis == "" ? [] : warning.Crisis.split(',');
+                let qinggans = warning.QingGan == "" ? [] : warning.QingGan.split(',');
+                crisises.forEach(ele => {
+                    that.data.wjList[ele - 1].isSelect = !that.data.wjList[ele - 1].isSelect
+                });
+                qinggans.forEach(ele => {
+                    that.data.qgList[ele - 1].isSelect = !that.data.qgList[ele - 1].isSelect
+                });
+                qudaos.forEach(ele => {
+                    that.data.affList[ele].isSelect = !that.data.affList[ele].isSelect
+                });
+                this.setData({
+                    qgList: that.data.qgList,
+                    wjList: that.data.wjList,
+                    affList: that.data.affList,
+                });
+            }
+            // let warnings = JSON.parse(res.Warning.Es);
+
             if (res.DetailsData) {
                 if (res.DetailsData[0].IsAdvancedQuery == 1) {
                     this.setData({
@@ -141,7 +164,7 @@ Page({
                     Source: res.DetailsData[0].Source,
                 })
             }
-           
+
             this.setData({
                 Name: res.Name,
                 StartTime: res.StartTime,
@@ -150,10 +173,10 @@ Page({
                 end: res.EndTime,
                 startShow: new Date(res.StartTime).valueOf(),
                 endShow: new Date(res.EndTime).valueOf(),
-                Statu:res.Warning.Statu
+                Statu: res.Warning.Statu
             })
         });
-      
+
     },
     getApi() {
         app.globalData.request({
@@ -198,7 +221,7 @@ Page({
         let that = this;
         let val = event.currentTarget.dataset.value;
         that.data.qgList[val.key - 1].isSelect = !that.data.qgList[val.key - 1].isSelect;
-        
+
         this.setData({
             qgList: that.data.qgList
         });
@@ -423,7 +446,7 @@ Page({
             }
         });
         let dtData = {
-            "AnalyzeWord": this.data.AnalyzeWord.replace("+","%2B"),
+            "AnalyzeWord": this.data.AnalyzeWord.replace("+", "%2B"),
             "HuoWord": this.data.HuoWord,
             "PaiChu": this.data.PaiChu,
             "IsAdvancedQuery": this.data.totalMode == 0 && this.data.currWordType == '必选词和的关系' ? 0 : this.data.totalMode == 1 ? 1 : 2,
@@ -453,7 +476,7 @@ Page({
             token: wx.getStorageSync('token') || 't%2BrswgjvzGM=',
             DataJson: dtJson,
         }).then(res => {
-            if(res !=[])
+            if (res != [])
                 wx.showModal({
                     title: '提示',
                     content: '编辑成功',
@@ -465,11 +488,11 @@ Page({
                         }
                     }
                 });
-            }).catch(err => {
-                wx.showModal({
-                    title: '提示',
-                    content: err.Msg,
-                })
+        }).catch(err => {
+            wx.showModal({
+                title: '提示',
+                content: err.Msg,
+            })
         });
     }
 })
\ No newline at end of file
diff --git a/pages/mine/index.js b/pages/mine/index.js
index 5f378cf..132d59e 100644
--- a/pages/mine/index.js
+++ b/pages/mine/index.js
@@ -87,26 +87,30 @@ Page({
             openid: wx.getStorageSync('openid'),
             token: wx.getStorageSync('token') || 't%2BrswgjvzGM='
         }
-        app.globalData.request(obj, (res => {
-            if (res.Code == 1) {
-                wx.showModal({
-                    title: '提示',
-                    content: "确定要退出嘛？",
-                    success(res) {
-                        if (res.confirm) {
-                            wx.setStorageSync("userInfo", null);
-                            wx.setStorageSync("token", "");
-                            wx.setStorageSync("openid", "");
-                            that.getUser();
+        return new Promise((resolve, reject) => {
+            app.globalData.request(obj, (res) => {
+                if (res.Code == 1) {
+                    wx.showModal({
+                        title: '提示',
+                        content: "确定要退出嘛？",
+                        success(res) {
+                            if (res.confirm) {
+                                wx.setStorageSync("userInfo", null);
+                                wx.setStorageSync("token", "");
+                                wx.setStorageSync("openid", "");
+                                that.getUser();
+                            }
                         }
-                    }
-                })
-            } else {
+                    })
+                }
+                resolve(true)
+            }).catch(err => {
                 wx.showModal({
                     title: '提示',
                     content: err.Msg,
                 })
-            }
-        }))
+                reject(false)
+            })
+        })
     }
 });
\ No newline at end of file
diff --git a/pages/mine/pages/register/register.js b/pages/mine/pages/register/register.js
index 14bd20d..729c7c0 100644
--- a/pages/mine/pages/register/register.js
+++ b/pages/mine/pages/register/register.js
@@ -68,20 +68,24 @@ Page({
             action: 'getVERCode',
             sPhone: this.data.sPhone,
         }
-        app.globalData.request(obj).then(res => {
-            // 定时60s
-            timer(this)
-            if (res.Code == 1) {
+        return new Promise((resolve, reject) => {
+            app.globalData.request(obj, (res) => {
+                // 定时60s
+                timer(this)
+                // if (res.Code == 1) {
+                //     wx.showModal({
+                //         title: '提示',
+                //         content: res.Msg,
+
+                //     })
+                // }
+                resolve(true)
+            }).catch(err => {
                 wx.showModal({
                     title: '提示',
-                    content: data.Msg,
-
+                    content: err.Msg,
                 })
-            }
-        }).catch(err => {
-            wx.showModal({
-                title: '提示',
-                content: err.Msg,
+                reject(false)
             })
         })
     },
@@ -109,49 +113,56 @@ Page({
         //     content: res.Msg,
         //   })
         // })
-        app.globalData.request(obj, (res) => {
-            if (res.Code == 1) {
-                wx.showModal({
-                    title: '提示',
-                    content: res.Msg,
-                })
+        return new Promise((resolve, reject) => {
+            app.globalData.request(obj, (res) => {
+                if (res.Code == 1) {
+                    wx.showModal({
+                        title: '提示',
+                        content: res.Msg,
+                    })
 
-            } else {
+                }
+                resolve(true)
+            }).catch(err => {
                 wx.showModal({
                     title: '提示',
                     content: err.Msg,
                 })
-            }
+                reject(false)
+            })
         })
     },
     getlist() {
+        let that = this
         let obj = {
             action: 'ifUserAdminOnly',
             sUserName: this.data.sUserName,
             sPhone: this.data.sPhone,
             sEmail: this.data.sEmail,
         }
-        console.log('cdssx', obj)
-        app.globalData.request(obj, (res) => {
-            console.log('cdx', res.data)
-            if (res.Code == 1) {
-                wx.showModal({
-                    title: '提示',
-                    content: res.Msg,
-                    success(res) {
-                        if (res.confirm) {
-                            this.captcha()
-                        } else {
+        return new Promise((resolve, reject) => {
+            app.globalData.request(obj, (res) => {
+                if (res.Code == 1) {
+                    wx.showModal({
+                        title: '提示',
+                        content: res.Msg,
+                        success(res) {
+                            if (res.confirm) {
+                                that.captcha()
+                            } else {
 
+                            }
                         }
-                    }
-                })
-            } else {
+                    })
+                }
+                resolve(true)
+            }).catch(err => {
                 wx.showModal({
                     title: '提示',
-                    content: res.Msg,
+                    content: err.Msg,
                 })
-            }
+                reject(false)
+            })
         })
 
     },
diff --git a/project.private.config.json b/project.private.config.json
index b58fde5..988f6d3 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -21,6 +21,13 @@
                     "query": "",
                     "launchMode": "default",
                     "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/mine/pages/bindUser/index",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
                 }
             ]
         }