Merge branch 'master' into master-pro

manifest.json

@@ -141,7 +141,7 @@
         }
     },
     "h5" : {
-        "title" : "Do it today",
+        "title" : "商户端",
         "domain" : "myhjdc.cn",
         "sdkConfigs" : {
             "maps" : {
@@ -151,6 +151,9 @@
                     "serviceHost" : ""
                 }
             }
+        },
+        "router" : {
+            "base" : "merchanth5"
         }
     }
 }

pages/evaluate/evaluate.vue

@@ -210,17 +210,23 @@
 				this.$http.post('/app/comments/reply',data).then(res =>{
 					console.log(res)
 					if(res.data.code == 200){
-						item.reply = ''
+						// item.reply = ''
 						uni.showToast({
 							icon:'none',
 							title:'回复成功'
 						})
-						this.appraiseList = []
-						let page = {
-							num: 1,
-							size: 10
-						}
-						this.getcommentList(page)
+						this.$router.go(0)
+						// this.appraiseList = []
+						// let page = {
+						// 	num: 1,
+						// 	size: 10
+						// }
+						// this.getcommentList(page)
+					}else{
+						uni.showToast({
+							icon:'none',
+							title:res.message
+						})
 					}