Merge branch 'master' into dev_jzp

app.js

@@ -21,7 +21,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest148? true : false;
+      data.isTest = data.isTest149? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

pages/user/suggest/suggest.wxml

@@ -2,6 +2,7 @@
 <view class="container-view">
     <view>
         <title-header title="投诉建议"></title-header>
+        <!-- <view class="tips">此投诉为本小程序自有投诉渠道，非微信官方投诉渠道</view> -->
         <view class="input-box">
             <view class="input-item">
             <text class="input-label">姓名:</text>

pages/user/suggest/suggest.wxss

@@ -82,4 +82,12 @@ page {
 
         text-align: left;
 
+  }
+
+  .tips{
+    background-color: #fdf6ec;
+    color: #e6a23c;
+    font-size: 26rpx;
+    text-align: center;
+    padding: 20rpx;
   }