xujing 5 年前
父节点
当前提交
82a75ca906

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

5
   defineConstants: {
5
   defineConstants: {
6
     // HOST: '"http://47.101.36.130:8085"',//测试
6
     // HOST: '"http://47.101.36.130:8085"',//测试
7
     // WSS_HOST: '"wss://47.101.36.130:8085"',
7
     // WSS_HOST: '"wss://47.101.36.130:8085"',
8
-    // HOST: '"https://dev.jinchengjiaye.com"',//测试
9
-    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
8
+    HOST: '"https://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://192.168.2.52:8080"',
13
-    WSS_HOST: '"ws://192.168.2.52:8080"',
12
+    // HOST: '"http://192.168.2.52:8080"',
13
+    // WSS_HOST: '"ws://192.168.2.52:8080"',
14
     Version: 'V3.5.5'
14
     Version: 'V3.5.5'
15
   },
15
   },
16
   weapp: {},
16
   weapp: {},

+ 1
- 1
config/prod.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
-    Version:'V3.5.5_2019-12-23'
12
+    Version:'V3.5.5_2019-12-24'
13
   },
13
   },
14
   weapp: {},
14
   weapp: {},
15
   h5: {}
15
   h5: {}

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

89
   componentWillUnmount() {
89
   componentWillUnmount() {
90
     this.stopTicker()
90
     this.stopTicker()
91
     this.state.pointRecordId && updatePoint(this.state.pointRecordId)
91
     this.state.pointRecordId && updatePoint(this.state.pointRecordId)
92
+
93
+    Taro.setStorageSync('router', { query: {} })
92
   }
94
   }
93
 
95
 
94
   componentDidShow() {
96
   componentDidShow() {

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

91
   componentWillUnmount() {
91
   componentWillUnmount() {
92
     this.stopTicker()
92
     this.stopTicker()
93
     this.state.pointRecordId && updatePoint(this.state.pointRecordId)
93
     this.state.pointRecordId && updatePoint(this.state.pointRecordId)
94
+
95
+    Taro.setStorageSync('router', { query: {} })
94
   }
96
   }
95
 
97
 
96
   componentDidShow() {
98
   componentDidShow() {

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

76
   componentWillUnmount() {
76
   componentWillUnmount() {
77
     const { recordId } = this.state
77
     const { recordId } = this.state
78
     recordId && updatePoint(recordId)
78
     recordId && updatePoint(recordId)
79
+
80
+    Taro.setStorageSync('router', { query: {} })
79
   }
81
   }
80
 
82
 
81
   loadDetail() {
83
   loadDetail() {

+ 2
- 0
src/pages/news/detail/index.js 查看文件

78
   componentWillUnmount() {
78
   componentWillUnmount() {
79
     const { recordId } = this.state
79
     const { recordId } = this.state
80
     recordId && updatePoint(recordId)
80
     recordId && updatePoint(recordId)
81
+
82
+    Taro.setStorageSync('router', { query: {} })
81
   }
83
   }
82
   // 报备客户
84
   // 报备客户
83
   reportClientFn() {
85
   reportClientFn() {

+ 4
- 2
src/pages/shop/index.scss 查看文件

83
       .message{
83
       .message{
84
         width: 100%;
84
         width: 100%;
85
         display: flex;
85
         display: flex;
86
-        justify-content: space-between;
87
         position: absolute;
86
         position: absolute;
88
         top:144px;
87
         top:144px;
89
         left:188px;
88
         left:188px;
96
               color: #666;
95
               color: #666;
97
               display: flex;
96
               display: flex;
98
               align-items: center;
97
               align-items: center;
98
+              
99
              &__right{
99
              &__right{
100
                 color: $primary-color;
100
                 color: $primary-color;
101
                 font-size: 40px;
101
                 font-size: 40px;
102
+                max-width: 110px;
103
+                @include text-ellipsis;
102
               }
104
               }
103
           }
105
           }
104
     
106
     
105
           &__btn{
107
           &__btn{
106
             display: flex;
108
             display: flex;
107
-            margin-left: 30px;
109
+            margin-left: 20px;
108
             align-items: center;
110
             align-items: center;
109
           }
111
           }
110
           &__img{
112
           &__img{

+ 13
- 12
src/pages/shop/rule/index.js 查看文件

14
   }
14
   }
15
 
15
 
16
   state = {
16
   state = {
17
-     pointRule:[]
17
+    pointRule: []
18
   }
18
   }
19
 
19
 
20
   componentWillMount() {
20
   componentWillMount() {
25
     Taro.showLoading()
25
     Taro.showLoading()
26
     this.props.dispatchPointsRule().then(res => {
26
     this.props.dispatchPointsRule().then(res => {
27
       this.setState({
27
       this.setState({
28
-        pointRule:res.records
28
+        pointRule: res.records
29
       })
29
       })
30
       Taro.hideLoading()
30
       Taro.hideLoading()
31
     })
31
     })
33
 
33
 
34
   render() {
34
   render() {
35
 
35
 
36
-    const {pointRule} = this.state
36
+    const { pointRule } = this.state
37
 
37
 
38
     return (
38
     return (
39
       <View className="page">
39
       <View className="page">
40
         <View className='rule_title'>
40
         <View className='rule_title'>
41
           <Text>积分项</Text>
41
           <Text>积分项</Text>
42
           <Text>奖励积分</Text>
42
           <Text>奖励积分</Text>
43
-          <Text>时间</Text>
43
+          <Text>说明</Text>
44
         </View>
44
         </View>
45
         <ScrollView
45
         <ScrollView
46
           scrollY
46
           scrollY
52
           }}>
52
           }}>
53
           {
53
           {
54
             pointRule.length === 0 ? '' : (
54
             pointRule.length === 0 ? '' : (
55
-                pointRule.map(item => (
56
-                   <View className='rule_item'  key={item.ruleId}>
57
-                     <Text>{item.ruleName}</Text>
58
-                     <Text>+{item.pointsAmount}</Text>
59
-                     <Text>{dayjs(item.updateDate).format('YYYY-MM-DD HH:mm:ss')}</Text>
60
-                   </View>
61
-                ))
55
+              pointRule.map(item => (
56
+                <View className='rule_item' key={item.ruleId}>
57
+                  <Text>{item.ruleName}</Text>
58
+                  <Text>+{item.pointsAmount}</Text>
59
+                  <Text>{item.remark}</Text>
60
+                  {/* <Text>{dayjs(item.updateDate).format('YYYY-MM-DD HH:mm:ss')}</Text> */}
61
+                </View>
62
+              ))
62
             )
63
             )
63
           }
64
           }
64
-         </ScrollView>
65
+        </ScrollView>
65
       </View>
66
       </View>
66
     );
67
     );
67
   }
68
   }