许静 5 лет назад
Родитель
Сommit
9594cd08c2
3 измененных файлов: 13 добавлений и 15 удалений
  1. 4
    4
      config/dev.js
  2. 7
    5
      src/pages/person/customerAnalysis/index.js
  3. 2
    6
      src/pages/shop/index.js

+ 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.0.84:8080"',
13
-    WSS_HOST: '"ws://192.168.0.84: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: {}

+ 7
- 5
src/pages/person/customerAnalysis/index.js Просмотреть файл

60
 
60
 
61
   render() {
61
   render() {
62
     const tabList = [{ title: '客户分析' }, { title: '我的客户' }]
62
     const tabList = [{ title: '客户分析' }, { title: '我的客户' }]
63
-    const { customerNum } = this.state
63
+    const { customerNum, current } = this.state
64
     return (
64
     return (
65
-      <AtTabs className="tab-box" current={this.state.current} tabList={tabList} onClick={this.handleClick.bind(this)}>
66
-        <AtTabsPane current={this.state.current} index={0} >
65
+      <AtTabs className="tab-box" current={current} tabList={tabList} onClick={this.handleClick.bind(this)}>
66
+        <AtTabsPane current={current} index={0} >
67
           <View >
67
           <View >
68
-            <Analysis></Analysis>
68
+            {
69
+              current != 1 && <Analysis></Analysis>
70
+            }
69
           </View>
71
           </View>
70
         </AtTabsPane>
72
         </AtTabsPane>
71
-        <AtTabsPane current={this.state.current} index={1}>
73
+        <AtTabsPane current={current} index={1}>
72
           <View style="padding:10px 20px; display: flex;flex-wrap: wrap;align-content: flex-start;justify-content: space-between;">
74
           <View style="padding:10px 20px; display: flex;flex-wrap: wrap;align-content: flex-start;justify-content: space-between;">
73
             <View className="my-customer" onClick={this.toFollowUpCustomer} style="border-right:1px solid rgba(0,0,0,0.12)">
75
             <View className="my-customer" onClick={this.toFollowUpCustomer} style="border-right:1px solid rgba(0,0,0,0.12)">
74
               <Image mode="widthFix" src={require('@assets/person/genjin.png')} className='img'></Image>
76
               <Image mode="widthFix" src={require('@assets/person/genjin.png')} className='img'></Image>

+ 2
- 6
src/pages/shop/index.js Просмотреть файл

36
     goodsBuilding: [],
36
     goodsBuilding: [],
37
     goodsList: [],
37
     goodsList: [],
38
     user: {},
38
     user: {},
39
+    current: 0,
40
+    points:0
39
   }
41
   }
40
 
42
 
41
   componentDidShow() {
43
   componentDidShow() {
245
         return;
247
         return;
246
     }
248
     }
247
   }
249
   }
248
-  state = {
249
-    current: 0,
250
-  }
251
-
252
-
253
 
250
 
254
   renderGoods() {
251
   renderGoods() {
255
     const { goods: { records = [] } } = this.props
252
     const { goods: { records = [] } } = this.props
385
             <Banner list={bannerList} onClick={this.handleBannerClick} indicatorDots={false}></Banner>
382
             <Banner list={bannerList} onClick={this.handleBannerClick} indicatorDots={false}></Banner>
386
           }
383
           }
387
 
384
 
388
-
389
           {this.renderGoods()}
385
           {this.renderGoods()}
390
         </ScrollView>
386
         </ScrollView>
391
       </View >
387
       </View >