瀏覽代碼

Merge branch 'v4' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into v4

张延森 5 年之前
父節點
當前提交
da118524b8
共有 3 個檔案被更改,包括 5 行新增5 行删除
  1. 2
    2
      config/dev.js
  2. 1
    1
      project.config.json
  3. 2
    2
      src/pages/activity/detail/assistance.js

+ 2
- 2
config/dev.js 查看文件

9
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
9
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
10
     // HOST: '"https://lt.pawoma.cn"',
10
     // HOST: '"https://lt.pawoma.cn"',
11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
12
-    HOST: '"http://127.0.0.1:8080"',
13
-    WSS_HOST: '"ws://127.0.0.1:8080"',
12
+    HOST: '"http://192.168.0.84:8080"',
13
+    WSS_HOST: '"ws://192.168.0.84:8080"',
14
   },
14
   },
15
   weapp: {},
15
   weapp: {},
16
   h5: {}
16
   h5: {}

+ 1
- 1
project.config.json 查看文件

2
 	"miniprogramRoot": "dist/",
2
 	"miniprogramRoot": "dist/",
3
 	"projectname": "mini-chengjiao",
3
 	"projectname": "mini-chengjiao",
4
 	"description": "dev环境",
4
 	"description": "dev环境",
5
-	"appid": "wxda1f84b79b3edeb3",
5
+	"appid": "wxd9ee3a9480a4e544",
6
 	"setting": {
6
 	"setting": {
7
 		"urlCheck": false,
7
 		"urlCheck": false,
8
 		"es6": false,
8
 		"es6": false,

+ 2
- 2
src/pages/activity/detail/assistance.js 查看文件

173
 
173
 
174
   // 请求详情
174
   // 请求详情
175
   loadDetail() {
175
   loadDetail() {
176
-    debugger
176
+    // debugger
177
     const { id, initiateId } = this.state
177
     const { id, initiateId } = this.state
178
     const { userInfo } = this.props
178
     const { userInfo } = this.props
179
 
179
 
362
     // 必须授权头像
362
     // 必须授权头像
363
     if (this.toggleGrantAvatar()) {
363
     if (this.toggleGrantAvatar()) {
364
       const initiateDetail = this.state.initiateDetail
364
       const initiateDetail = this.state.initiateDetail
365
-      debugger
365
+      // debugger
366
       if (!initiateDetail.helpRecordInitiateId) {
366
       if (!initiateDetail.helpRecordInitiateId) {
367
         // 如果是未发起的助力, 先以当前人身份发起
367
         // 如果是未发起的助力, 先以当前人身份发起
368
         this.startMine().then(() => {
368
         this.startMine().then(() => {