lh

config/dev.js

@@ -9,15 +9,9 @@ module.exports = {
     WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-<<<<<<< HEAD
-    HOST: '"http://192.168.2.51:8080"',
-    WSS_HOST: '"ws://192.168.2.51:8080"',
-    Version:'V3.5.2.2_12102'
-=======
-    // HOST: '"http://192.168.2.52:8080"',
-    // WSS_HOST: '"ws://192.168.2.52:8080"',
-    Version: 'V3.5.2.2_12121'
->>>>>>> cbe91908d12d4a713e5490b4702108ce3186a31e
+    // HOST: '"http://192.168.2.51:8080"',
+    // WSS_HOST: '"ws://192.168.2.51:8080"',
+    Version: 'V3.5.2.2_12122'
   },
   weapp: {},
   h5: {}

src/pages/person/index.js

@@ -83,7 +83,6 @@ export default class Person extends Component {
       url: '/pages/shop/index'
     })
   }
-
   redirectTo = (url) => {
     if (url) {
       if (typeof url === 'function') {

src/pages/project/detail/index.scss

@@ -863,7 +863,7 @@
     font-size: 40px;
     color: #000;
     font-weight: bold;
-    height: 76px;
+    height: 86px;
     margin-top: 10px;
   }
 

src/pages/project/index.js

@@ -36,10 +36,10 @@ export default class Index extends Component {
     keywords: '',
     loaded: false,
     maskBanner: '',
-    shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/cff400dab32e9230f6bf7498b8291d7.jpg',
-    // shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg',
+    // shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/cff400dab32e9230f6bf7498b8291d7.jpg',
+    shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg',
     // shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1565358322510-share.jpg',
-    adImage: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/f58480ff83787b64235b729bca5d805.jpg',
+    // adImage: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/f58480ff83787b64235b729bca5d805.jpg',
     bannerList: [],
     helpGroupList: [],
     newsList: [],
@@ -95,7 +95,6 @@ export default class Index extends Component {
   componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
-
   }
 
   getLocation() {
@@ -269,7 +268,7 @@ export default class Index extends Component {
 
     const payload = {
       name: keywords,
-      pageSize: 10
+      pageSize: 999
     }
     if (curCity.id) {
       payload.cityId = curCity.id

src/pages/shop/index.js

@@ -358,7 +358,7 @@ export default class Shop extends Component {
               <View className='user__left__name'>{person.nickname}</View>
               {
                 user.havaSigned ?
-                  (<View className="qiandao__btn">已签到</View>) :
+                  (<View className="reday-qiandao-btn">已签到</View>) :
                   (<View className="qiandao__btn" onClick={this.doSign}>签到</View>)
               }
               <View className='message'>

src/pages/shop/index.scss

@@ -70,6 +70,16 @@
         border-radius: 12px;
         color: #fff;
       }
+      .reday-qiandao-btn{
+        padding: 6px 18px;
+        font-size: 28px;
+        color: #fff;
+        position: absolute;
+        top:64px;
+        right:70px;
+        background-color: #DADADA;
+        border-radius: 12px;
+      }
       .message{
         width: 100%;
         display: flex;