Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev

config/dev.js

@@ -6,6 +6,7 @@ module.exports = {
     // HOST: '"http://127.0.0.1:8080"',
     HOST: '"http://sgl-v2-test.njyunzhi.com"',
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
+    VERSION: '"2.0.33"',
   },
   mini: {},
   h5: {},

config/prod.js

@@ -3,8 +3,9 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"https://sgl-v2-test.njyunzhi.com"',
+    HOST: '"https://sgl-v2.njyunzhi.com"',
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
+    VERSION: '"2.0.33"',
   },
   mini: {},
   h5: {

project.config.json

@@ -2,7 +2,7 @@
   "miniprogramRoot": "./dist",
   "projectname": "miniapp",
   "description": "十公里",
-  "appid": "wx835627a9b9b3932a",
+  "appid": "wx06a7372d48d56843",
   "setting": {
     "urlCheck": true,
     "es6": false,

src/pages/index/tabs/Mine.jsx

@@ -155,6 +155,14 @@ export default (props) => {
             </view>
           </view>
         </view>
+        <view className='Version-box'  >
+          <view className='Version-box-number'>
+            版本：{VERSION}
+          </view>
+          <view className='Version-box-yunzhi'>
+            技术支持：云致科技 @ 2021
+          </view>
+        </view>
       </view>
     </scroll-view>
   )

src/pages/index/tabs/MineCss/style.less

@@ -186,4 +186,18 @@
       }
     }
   }
+  .Version-box {
+    width: 100%;
+    margin: 0px auto;
+    padding: 30px 0;
+    text-align: center;
+    .Version-box-number {
+      font-size: 23px;
+      color: #999;
+    }
+    .Version-box-yunzhi {
+      font-size: 23px;
+      color: #999;
+    }
+  }
 }

src/utils/request.js

@@ -41,7 +41,7 @@ export default (url, options) => {
 
           if (!skipError) {
             Taro.showToast({
-              title: message||'网络异常',
+              title: message || '网络异常',
               icon: 'none',
             })
           }
@@ -49,7 +49,7 @@ export default (url, options) => {
           reject(message?.indexOf('java') > -1 ? '系统内部错误' : message)
         }
       },
-    
+
       fail: (err) => {
         console.error(err)
 
@@ -89,19 +89,19 @@ export function uploadFile(filePath) {
       success: (res) => {
         if (res.errMsg === 'uploadFile:ok') {
           const { code, message, data, token } = JSON.parse(res.data)
-  
+
           if (token || data?.token) {
             Taro.setStorage({ key: 'token', data: token || data?.token })
           }
-  
+
           if (code === 1000) {
             resolve(data)
           } else {
             console.error(res)
-  
+
             logger.error("上传文件失败")
             logger.error(res)
-  
+
             reject(message?.indexOf('java') > -1 ? '系统内部错误' : message)
           }
         } else {