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

project.config.json

 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
 	"description": "知与行联调",
-	"appid": "wxda1f84b79b3edeb3",
+	"appid": "wxd9ee3a9480a4e544",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

project.config.json.rej

+diff a/project.config.json b/project.config.json	(rejected hunks)
+@@ -2,6 +2,7 @@
+ 	"miniprogramRoot": "dist/",
+ 	"projectname": "mini-chengjiao",
+ 	"description": "知与行联调",
++	"appid": "wxd9ee3a9480a4e544",
+ 	"setting": {
+ 		"urlCheck": false,
+ 		"es6": false,

src/pages/person/customerAnalysis/analysis.js

         <AtTabs className="tab-bar" current={current} tabList={tabList} onClick={this.handleClick.bind(this)} swipeable="false">
           <AtTabsPane current={current} index={0} >
             <View>
+              <View style="height:40rpx;position: relative;margin-top:20rpx">
+                <View className="daily-month" >
+                  {
+                    dailyMonth.map((item, index) => (
+                      <View key={index + 'daily'} className={checkedWhich == index ? 'checked' : 'item'} onClick={this.changeDailyMonth.bind(this, index)}>
+                        {item}
+                      </View>))
+                  }
+                </View>
+              </View>
               {
                 chartInfo.length &&
-                <View>
-                  <View style="height:40rpx;position: relative;margin-top:20rpx">
-                    <View className="daily-month" >
-                      {
-                        dailyMonth.map((item, index) => (
-                          <View key={index + 'daily'} className={checkedWhich == index ? 'checked' : 'item'} onClick={this.changeDailyMonth.bind(this, index)}>
-                            {item}
-                          </View>))
-                      }
-                    </View>
-                  </View>
-                  <View style="width:100vw;height:530rpx;position: relative;">
-                    <LineChart source={chartInfo} />
-                  </View>
-                </View>
+
+
+                // <View style="width:100vw;height:530rpx;position: relative;">
+                <LineChart source={chartInfo} />
+                // </View>
+
               }
               {
                 !chartInfo.length &&
           </AtTabsPane>
           <AtTabsPane current={current} index={1}>
             <View>
+              <View style="height:40rpx;position: relative;margin-top:20rpx">
+                <View className="daily-month" >
+                  {
+                    dailyMonth.map((item, index) => (
+                      <View key={index + 'month'} className={checkedWhich == index ? 'checked' : 'item'} onClick={this.changeDailyMonth.bind(this, index)}>
+                        {item}
+                      </View>))
+                  }
+                </View>
+              </View>
               {chartInfo2.length &&
-                <View>
-                  <View style="height:40rpx;position: relative;margin-top:20rpx">
-                    <View className="daily-month" >
-                      {
-                        dailyMonth.map((item, index) => (
-                          <View key={index + 'month'} className={checkedWhich == index ? 'checked' : 'item'} onClick={this.changeDailyMonth.bind(this, index)}>
-                            {item}
-                          </View>))
-                      }
-                    </View>
-                  </View>
-                  <View style="width:100vw;height:530rpx;position: relative;">
-                    <LineChart source={chartInfo2} />
-                  </View>
+                <View style="width:100vw;height:530rpx;position: relative;">
+                  <LineChart source={chartInfo2} />
                 </View>
               }
               {
           </AtTabsPane>
           <AtTabsPane current={current} index={2}>
             <View>
+              <View style="height:40rpx;position: relative;margin-top:20rpx">
+                <View className="daily-month" >
+                  {
+                    dailyMonth.map((item, index) => (
+                      <View key={index + 'day'} className={checkedWhich == index ? 'checked' : 'item'} onClick={this.changeDailyMonth.bind(this, index)}>
+                        {item}
+                      </View>))
+                  }
+                </View>
+              </View>
               {
                 chartInfo3.length &&
-                <View>
-                  <View style="height:40rpx;position: relative;margin-top:20rpx">
-                    <View className="daily-month" >
-                      {
-                        dailyMonth.map((item, index) => (
-                          <View key={index + 'day'} className={checkedWhich == index ? 'checked' : 'item'} onClick={this.changeDailyMonth.bind(this, index)}>
-                            {item}
-                          </View>))
-                      }
-                    </View>
-                  </View>
-                  <View style="width:100vw;height:530rpx;position: relative;">
-                    <LineChart source={chartInfo3} />
-                  </View>
+                <View style="width:100vw;height:530rpx;position: relative;">
+                  <LineChart source={chartInfo3} />
                 </View>
               }
               {

src/pages/person/customerAnalysis/followUpCustomer/index.js

 import { connect } from '@tarojs/redux'
 import { View, Text, Picker } from '@tarojs/components';
 import { queryCustomerList, addFollowRecord } from '@services/person'
-const iconImg = require('@assets/person/icon.png')
+const maleImg = require('@assets/person/male.png')
+const femaleImg = require('@assets/person/female.png')
+const phoneImg = require('@assets/person/phone.png')
 
 @connect(({ user, city }) => ({ user, city }))
 export default class transactionCustomer extends Taro.Component {
                     <View className="name">
                       {item.name}
                       {
-                        item.sex == '1' && <View style={`margin-left:20rpx;background-image: url(${iconImg});background-size: 100%;background-position: 0rpx -40rpx;width: 36rpx;height: 36rpx;`}></View>
+                        item.sex == '1' && <Image style="width:36rpx;height:38rpx;margin-left:10rpx" src={maleImg} />
                       }
                       {
-                        item.sex == '2' && <View style={`margin-left:20rpx;background-image: url(${iconImg});background-size: 100%;background-position: 0rpx 0px;width: 36rpx;height: 36rpx;`}></View>
+                        item.sex == '2' && <Image src={femaleImg} style="width:36rpx;height:36rpx;margin-left:10rpx" />
                       }
                     </View>
-                    <View className="phone" onClick={this.handleTelClick.bind(this, item)}>{item.phone}<View style={`background-image: url(${iconImg});background-size: 100%;background-position: 0rpx -88rpx;width: 44rpx;height: 44rpx;margin-left:10rpx`}></View> </View>
-                    <View className="status">报备</View>
+                    <View className="phone" onClick={this.handleTelClick.bind(this, item)}>{item.phone}<Image style="width:36rpx;height:36rpx;margin-left:20rpx;" src={phoneImg} /></View>
+                    <View className="status">{item.status == 1 ? '报备' : item.status == 2 ? '到访' : item.status == 3 ? '认筹' : '签约'}</View>
                   </View>
                 ))
               }
             </View>
           </ListView>
-
-
         </View>
       </View>
     )

src/pages/person/customerAnalysis/myCustomer.js

 import './index.scss'
 import ActivityItem from './item'
 import dayjs from 'dayjs'
-const iconImg = require('@assets/person/icon.png')
 import { getThumbnail } from '@utils/tools'
 import emptyImg from '@assets/empty.png'
+const maleImg = require('@assets/person/male.png')
+const femaleImg = require('@assets/person/female.png')
+const phoneImg = require('@assets/person/phone.png')
 
 @connect(({ user, city }) => ({ user, city }))
 export default class myCustomer extends Taro.Component {
           <View className='user__left__name'>
             {customerDetail.name}
             {
-              customerDetail.sex == '1' && <View style={`margin-left:10px;background-image: url(${iconImg});background-size: 100%;background-position: 0px -20px;width: 18px;height: 18px;`}></View>
+              customerDetail.sex == '1' && <Image style="width:36rpx;height:38rpx;margin-left:10rpx" src={maleImg} />
             }
             {
-              customerDetail.sex == '2' && <View style={`margin-left:10px;background-image: url(${iconImg});background-size: 100%;background-position: 0px 0px;width: 18px;height: 18px;`}></View>
+              customerDetail.sex == '2' && <Image style="width:36rpx;height:36rpx;margin-left:10rpx" src={femaleImg} />
             }
           </View>
-          <View onClick={this.handleTelClick.bind(this, customerDetail)} className='user__left__phone'>{customerDetail.phone}<View style={`background-image: url(${iconImg});background-size: 100%;background-position: 0rpx -88rpx;width: 44rpx;height: 44rpx;margin-left:10rpx`}></View></View>
+          <View onClick={this.handleTelClick.bind(this, customerDetail)} className='user__left__phone'>{customerDetail.phone}<Image style="width:36rpx;height:36rpx;margin-left:20rpx;" src={phoneImg} /></View>
         </View>
         <AtTabs height="calc(100vh - 400rpx)" className="my-tab" current={this.state.current} tabList={tabList} onClick={this.handleClick.bind(this)}>
           <AtTabsPane current={this.state.current} index={0} >

src/pages/person/customerAnalysis/transactionCustomer/index.js

 import './index.scss'
 import { savePoint, updatePoint } from '@services/common'
 import { connect } from '@tarojs/redux'
-import { queryCustomerList } from '@services/person'
-const iconImg = require('@assets/person/icon.png')
+import { queryCustomerList, addFollowRecord } from '@services/person'
+const maleImg = require('@assets/person/male.png')
+const femaleImg = require('@assets/person/female.png')
+const phoneImg = require('@assets/person/phone.png')
 
 
 @connect(({ user, city }) => ({ user, city }))
       url: `/pages/person/customerAnalysis/myCustomer?customerId=` + customerId
     })
   }
+  // 拨打电话
+  handleTelClick(item, e) {
+    e.stopPropagation()
+    Taro.makePhoneCall({
+      phoneNumber: item.phone
+    })
+    const params = {
+      recordType: '拨打电话',
+      customerSex: item.sex,
+      customerId: item.customerId,
+    }
+    addFollowRecord(params).then(res => {
+
+    })
+    this.setState({
+      followVisible: false,
+    })
+  }
 
   render() {
     const { customerList, isEmpty, hasMore } = this.state
                   <View className="name">
                     {item.name}
                     {
-                      item.sex == '1' && <View style={`margin-left:10px;background-image: url(${iconImg});background-size: 100%;background-position: 0px -20px;width: 18px;height: 18px;`}></View>
+                      item.sex == '1' && <Image style="width:36rpx;height:38rpx;margin-left:10rpx" src={maleImg} />
                     }
                     {
-                      item.sex == '2' && <View style={`margin-left:10px;background-image: url(${iconImg});background-size: 100%;background-position: 0px 0px;width: 18px;height: 18px;`}></View>
+                      item.sex == '2' && <Image style="width:36rpx;height:36rpx;margin-left:10rpx" src={femaleImg} />
                     }
                   </View>
                   <View className="phone">{item.phone} </View>
-                  <View style={`background-image: url(${iconImg});background-size: 100%;background-position: 0px -44px;width: 22px;height: 22px;`}></View>
+                  <Image style="width:36rpx;height:36rpx;margin-right:20rpx" src={phoneImg} onClick={this.handleTelClick.bind(this, item)} />
+
                 </View>
               ))
             }

src/utils/request.js

         }
       }
       console.error(res.data)
-      throw new Error(res.message)
+      throw new Error(data)
     }
   }).catch((err) => {
     console.error(err)
 
-    let errMessage = `请求失败: ${err.errMsg || err.message}`
-    if (err.errMsg === 'request:fail timeout' || err.message === 'request:fail timeout') {
+    let errMessage = `请求失败: ${err.errMsg}`
+    if (err.errMsg === 'request:fail timeout') {
       errMessage = '请检查网络'
     }