Procházet zdrojové kódy

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

李志伟 před 3 roky
rodič
revize
82b7533442

+ 1
- 0
config/dev.js Zobrazit soubor

6
     // HOST: '"http://127.0.0.1:8080"',
6
     // HOST: '"http://127.0.0.1:8080"',
7
     HOST: '"http://sgl-v2-test.njyunzhi.com"',
7
     HOST: '"http://sgl-v2-test.njyunzhi.com"',
8
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
8
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
9
+    VERSION: '"2.0.33"',
9
   },
10
   },
10
   mini: {},
11
   mini: {},
11
   h5: {},
12
   h5: {},

+ 2
- 1
config/prod.js Zobrazit soubor

3
     NODE_ENV: '"production"'
3
     NODE_ENV: '"production"'
4
   },
4
   },
5
   defineConstants: {
5
   defineConstants: {
6
-    HOST: '"https://sgl-v2-test.njyunzhi.com"',
6
+    HOST: '"https://sgl-v2.njyunzhi.com"',
7
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
7
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
8
+    VERSION: '"2.0.33"',
8
   },
9
   },
9
   mini: {},
10
   mini: {},
10
   h5: {
11
   h5: {

+ 1
- 1
project.config.json Zobrazit soubor

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

+ 8
- 0
src/pages/index/tabs/Mine.jsx Zobrazit soubor

155
             </view>
155
             </view>
156
           </view>
156
           </view>
157
         </view>
157
         </view>
158
+        <view className='Version-box'  >
159
+          <view className='Version-box-number'>
160
+            版本:{VERSION}
161
+          </view>
162
+          <view className='Version-box-yunzhi'>
163
+            技术支持:云致科技 @ 2021
164
+          </view>
165
+        </view>
158
       </view>
166
       </view>
159
     </scroll-view>
167
     </scroll-view>
160
   )
168
   )

+ 14
- 0
src/pages/index/tabs/MineCss/style.less Zobrazit soubor

186
       }
186
       }
187
     }
187
     }
188
   }
188
   }
189
+  .Version-box {
190
+    width: 100%;
191
+    margin: 0px auto;
192
+    padding: 30px 0;
193
+    text-align: center;
194
+    .Version-box-number {
195
+      font-size: 23px;
196
+      color: #999;
197
+    }
198
+    .Version-box-yunzhi {
199
+      font-size: 23px;
200
+      color: #999;
201
+    }
202
+  }
189
 }
203
 }

+ 6
- 6
src/utils/request.js Zobrazit soubor

41
 
41
 
42
           if (!skipError) {
42
           if (!skipError) {
43
             Taro.showToast({
43
             Taro.showToast({
44
-              title: message||'网络异常',
44
+              title: message || '网络异常',
45
               icon: 'none',
45
               icon: 'none',
46
             })
46
             })
47
           }
47
           }
49
           reject(message?.indexOf('java') > -1 ? '系统内部错误' : message)
49
           reject(message?.indexOf('java') > -1 ? '系统内部错误' : message)
50
         }
50
         }
51
       },
51
       },
52
-    
52
+
53
       fail: (err) => {
53
       fail: (err) => {
54
         console.error(err)
54
         console.error(err)
55
 
55
 
89
       success: (res) => {
89
       success: (res) => {
90
         if (res.errMsg === 'uploadFile:ok') {
90
         if (res.errMsg === 'uploadFile:ok') {
91
           const { code, message, data, token } = JSON.parse(res.data)
91
           const { code, message, data, token } = JSON.parse(res.data)
92
-  
92
+
93
           if (token || data?.token) {
93
           if (token || data?.token) {
94
             Taro.setStorage({ key: 'token', data: token || data?.token })
94
             Taro.setStorage({ key: 'token', data: token || data?.token })
95
           }
95
           }
96
-  
96
+
97
           if (code === 1000) {
97
           if (code === 1000) {
98
             resolve(data)
98
             resolve(data)
99
           } else {
99
           } else {
100
             console.error(res)
100
             console.error(res)
101
-  
101
+
102
             logger.error("上传文件失败")
102
             logger.error("上传文件失败")
103
             logger.error(res)
103
             logger.error(res)
104
-  
104
+
105
             reject(message?.indexOf('java') > -1 ? '系统内部错误' : message)
105
             reject(message?.indexOf('java') > -1 ? '系统内部错误' : message)
106
           }
106
           }
107
         } else {
107
         } else {