router

config/dev.js

@@ -5,12 +5,12 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://47.101.36.130:8085"',//测试
     // WSS_HOST: '"wss://47.101.36.130:8085"',
-    // HOST: '"https://dev.jinchengjiaye.com"',//测试
-    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
+    HOST: '"https://dev.jinchengjiaye.com"',//测试
+    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    HOST: '"http://192.168.2.52:8080"',
-    WSS_HOST: '"ws://192.168.2.52:8080"',
+    // HOST: '"http://192.168.2.52:8080"',
+    // WSS_HOST: '"ws://192.168.2.52:8080"',
     Version: 'V3.5.5'
   },
   weapp: {},

config/prod.js

@@ -9,7 +9,7 @@ module.exports = {
     WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    Version:'V3.5.5_2019-12-23'
+    Version:'V3.5.5_2019-12-24'
   },
   weapp: {},
   h5: {}

src/pages/activity/detail/assemble.js

@@ -89,6 +89,8 @@ export default class Detail extends Component {
   componentWillUnmount() {
     this.stopTicker()
     this.state.pointRecordId && updatePoint(this.state.pointRecordId)
+
+    Taro.setStorageSync('router', { query: {} })
   }
 
   componentDidShow() {

src/pages/activity/detail/assistance.js

@@ -91,6 +91,8 @@ export default class Detail extends Component {
   componentWillUnmount() {
     this.stopTicker()
     this.state.pointRecordId && updatePoint(this.state.pointRecordId)
+
+    Taro.setStorageSync('router', { query: {} })
   }
 
   componentDidShow() {

src/pages/activity/detail/index.js

@@ -76,6 +76,8 @@ export default class Detail extends Component {
   componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
+
+    Taro.setStorageSync('router', { query: {} })
   }
 
   loadDetail() {

src/pages/news/detail/index.js

@@ -78,6 +78,8 @@ export default class NewsDetail extends Component {
   componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
+
+    Taro.setStorageSync('router', { query: {} })
   }
   // 报备客户
   reportClientFn() {

src/pages/shop/index.scss

@@ -83,7 +83,6 @@
       .message{
         width: 100%;
         display: flex;
-        justify-content: space-between;
         position: absolute;
         top:144px;
         left:188px;
@@ -96,15 +95,18 @@
               color: #666;
               display: flex;
               align-items: center;
+              
              &__right{
                 color: $primary-color;
                 font-size: 40px;
+                max-width: 110px;
+                @include text-ellipsis;
               }
           }
     
           &__btn{
             display: flex;
-            margin-left: 30px;
+            margin-left: 20px;
             align-items: center;
           }
           &__img{

src/pages/shop/rule/index.js

@@ -14,7 +14,7 @@ export default class Shop extends Component {
   }
 
   state = {
-     pointRule:[]
+    pointRule: []
   }
 
   componentWillMount() {
@@ -25,7 +25,7 @@ export default class Shop extends Component {
     Taro.showLoading()
     this.props.dispatchPointsRule().then(res => {
       this.setState({
-        pointRule:res.records
+        pointRule: res.records
       })
       Taro.hideLoading()
     })
@@ -33,14 +33,14 @@ export default class Shop extends Component {
 
   render() {
 
-    const {pointRule} = this.state
+    const { pointRule } = this.state
 
     return (
       <View className="page">
         <View className='rule_title'>
           <Text>积分项</Text>
           <Text>奖励积分</Text>
-          <Text>时间</Text>
+          <Text>说明</Text>
         </View>
         <ScrollView
           scrollY
@@ -52,16 +52,17 @@ export default class Shop extends Component {
           }}>
           {
             pointRule.length === 0 ? '' : (
-                pointRule.map(item => (
-                   <View className='rule_item'  key={item.ruleId}>
-                     <Text>{item.ruleName}</Text>
-                     <Text>+{item.pointsAmount}</Text>
-                     <Text>{dayjs(item.updateDate).format('YYYY-MM-DD HH:mm:ss')}</Text>
-                   </View>
-                ))
+              pointRule.map(item => (
+                <View className='rule_item' key={item.ruleId}>
+                  <Text>{item.ruleName}</Text>
+                  <Text>+{item.pointsAmount}</Text>
+                  <Text>{item.remark}</Text>
+                  {/* <Text>{dayjs(item.updateDate).format('YYYY-MM-DD HH:mm:ss')}</Text> */}
+                </View>
+              ))
             )
           }
-         </ScrollView>
+        </ScrollView>
       </View>
     );
   }