Merge branch 'master' of http://git.wealfavor.cn/root/wh-new-xcx

.env.js

@@ -11,19 +11,22 @@ if (__wxConfig.envVersion === 'release') {
 //#endif
 // #ifndef MP-WEIXIN
 if (version === 'develop') {
+    ENV_CONFIG.isCanvas2d = false
     //开发环境
     // ENV_CONFIG = require('.env.dev.js');
     ENV_CONFIG = require('.env.trial.js');
     // ENV_CONFIG = require('.env.prod.js');
 }else if(version === 'trial'){
+    ENV_CONFIG.isCanvas2d = true
     //体验环境
     ENV_CONFIG = require('.env.trial.js');
 } else{
+    ENV_CONFIG.isCanvas2d = true
     //生产环境
     ENV_CONFIG = require('.env.prod.js');
 }
 //#endif
-ENV_CONFIG.isCanvas2d = true
+
 //给环境变量process.uniEnv赋值
 if (ENV_CONFIG !== null) {
     process.uniEnv = {};

common/chart/circle_chart.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="charts-box" :style="[{width},{height},]">
     <qiun-data-charts 
-	  :canvas2d='true'
+	  :canvas2d='isCanvas2d'
 	  :canvasId='canvasId'
       type="arcbar"
       :opts="opts"
@@ -33,6 +33,7 @@ export default {
   },
   data() {
     return {
+      isCanvas2d:process.uniEnv.isCanvas2d,
       chartData: {},
       //这里的 opts 是图表类型 type="arcbar" 的全部配置参数，您可以将此配置复制到 config-ucharts.js 文件中下标为 ['arcbar'] 的节点中来覆盖全局默认参数。实际应用过程中 opts 只需传入与全局默认参数中不一致的【某一个属性】即可实现同类型的图表显示不同的样式，达到页面简洁的需求。
       opts: {

common/chart/peak_chart.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="charts-box">
     <qiun-data-charts
-	  :canvas2d='true'
+	  :canvas2d='isCanvas2d'
 	  :canvasId='canvasId'
       type="mount"
       :opts="opts"
@@ -20,6 +20,7 @@ export default {
   },	
   data() {
     return {
+      isCanvas2d:process.uniEnv.isCanvas2d,
       chartData: {},
       //这里的 opts 是图表类型 type="mount" 的全部配置参数，您可以将此配置复制到 config-ucharts.js 文件中下标为 ['mount'] 的节点中来覆盖全局默认参数。实际应用过程中 opts 只需传入与全局默认参数中不一致的【某一个属性】即可实现同类型的图表显示不同的样式，达到页面简洁的需求。
       opts: {

common/chart/pie_chart.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="charts-box">
     <qiun-data-charts
-	  :canvas2d='true'
+	  :canvas2d='isCanvas2d'
 	  canvasId='cirle'
       type="pie"
       :opts="opts"
@@ -16,6 +16,7 @@
 export default {
   data() {
     return {
+      isCanvas2d:process.uniEnv.isCanvas2d,
       chartData: {},
       //这里的 opts 是图表类型 type="pie" 的全部配置参数，您可以将此配置复制到 config-ucharts.js 文件中下标为 ['pie'] 的节点中来覆盖全局默认参数。实际应用过程中 opts 只需传入与全局默认参数中不一致的【某一个属性】即可实现同类型的图表显示不同的样式，达到页面简洁的需求。
       opts: {

common/system_popup/system_popup.vue

@@ -3,10 +3,11 @@
 		<view class="column justify-center avatar r-100">
 			<view class="avatar r-100" style="background-color: rgba(0, 0, 0, 0.1);"></view>
 			<view class="row-c avatar_name m-l20">
-				<image class="wh-100 r-circle" src="/static/img/logo.png" mode=""></image>
+				<image class="wh-100 r-circle" v-if="memberData.head_img" src="/static/img/index/index-avatar.png" mode=""></image>
+				<image class="wh-100 r-circle" v-else :src="memberData.head_img" mode="aspectFill"></image>
 				<view class="column m-l20">
-					<text class="size-30 text-color-333">团子</text>
-					<text class="size-26 text-color-666">游客</text>
+					<text class="size-30 text-color-333">{{ memberData.name ? memberData.name : memberData.nickname }}</text>
+					<text class="size-26 text-color-666">{{memberData.position_name?memberData.position_name:'无'}}</text>
 				</view>
 			</view>
 		</view>
@@ -21,6 +22,18 @@
 
 <script>
 	export default {
+    props:{
+      memberData:{
+        default:{
+          position_name: "",
+          head_img: "",
+          id: 5,
+          name: "",
+          nickname: "",
+          phone: "",
+        }
+      }
+    },
 		data() {
 			return {
 				topNavHeight: null,

manifest.json

@@ -44,28 +44,27 @@
             "ios" : {},
             /* SDK配置 */
             "sdkConfigs" : {},
-			"plugins":{
-				"mp-weixin":{
-					"version": "2.5.0"
-				}
-			}
-			
+            "plugins" : {
+                "mp-weixin" : {
+                    "version" : "2.5.0"
+                }
+            }
         }
     },
     /* 快应用特有相关 */
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxab21b1a3ea8bcd7e",
-		"optimization" : {
-		    "subPackages" : true
-		},
+        "appid" : "wx200b542e9c6119bc",
+        "optimization" : {
+            "subPackages" : true
+        },
         "setting" : {
             "urlCheck" : false,
             "minified" : true
         },
         "usingComponents" : true,
-		"version": "2.5.0"
+        "version" : "2.5.0"
     },
     "mp-alipay" : {
         "usingComponents" : true

pages/index/index.vue

@@ -2,8 +2,8 @@
 	<view class="total-page page-env-160 page-box">
 		<Nav :title="'工作台导航'" :back="false" :is_fixed="true" :opacity="scrollTop" :justify="'left'" :color="'#fff'">
 			<view class="p-20">
-				<IndexPersonal></IndexPersonal>
-				<IndexColumn></IndexColumn>
+				<IndexPersonal @setMemberData="setMemberData"></IndexPersonal>
+				<IndexColumn :memberData="memberData"></IndexColumn>
 			</view>
 		</Nav>
 		<view class="p-lr20 m-tb30">
@@ -88,7 +88,8 @@
 					color: '#3ABF7D',
 					value: "100%"
 				}, ],
-				taskList: []
+				taskList: [],
+        memberData:{}
 			}
 		},
 		onLoad() {
@@ -101,6 +102,9 @@
 			console.log('到底部了');
 		},
 		methods: {
+      setMemberData(memberData){
+        this.memberData=memberData
+      },
 			onChangeTime(e) {
 				this.indexTime = e
 			},

pages/index/module/index_column.vue

@@ -14,7 +14,7 @@
 						<text class="size-26 text-color-fff">任务记录</text>
 					</view>
 					<text class="column_record_num text-color-fff size-24 text-center r-12 line-30 p-tb6">
-						创建中(2)
+						创建中({{memberData.draftNum}})
 					</text>
 				</view>
 				<view class="column_line"></view>
@@ -23,7 +23,7 @@
 						<text class="size-26 text-color-fff">征信审核</text>
 					</view>
 					<text class="column_record_num text-color-fff size-24 text-center r-12 line-30 p-tb6">
-						待验证(2)
+						待验证({{memberData.creditNum}})
 					</text>
 				</view>
 			</view>
@@ -63,8 +63,8 @@
 				<view class="m-l40" style="position: relative;">
 					<image class="wh-90 r-circle m-r20" src="/static/img/index/index-task.png" mode="">
 					</image>
-					<view class="task_num text-color-fff size-20" style="">
-						12
+					<view class="task_num text-color-fff size-20" style="" v-if="memberData.take_num>0">
+            {{memberData.take_num}}
 					</view>
 				</view>
 				<text class="text-color-12 sys-weight-600">领取任务</text>
@@ -73,8 +73,8 @@
 				<view class="m-l40" style="position: relative;">
 					<image class="wh-90 r-circle m-r20" src="/static/img/index/index-money.png" mode="">
 					</image>
-					<view class="task_num text-color-fff size-20" style="">
-						12
+					<view class="task_num text-color-fff size-20" style="" v-if="memberData.noticeNum>0">
+            {{memberData.noticeNum}}
 					</view>
 				</view>
 				<text class="text-color-12 sys-weight-600">任务消息</text>
@@ -87,6 +87,20 @@
 	export default {
 		name: 'index_column',
 		props: {
+      memberData:{
+        default:{
+          position_name: "",
+          head_img: "",
+          id: 5,
+          name: "",
+          nickname: "",
+          phone: "",
+          draftNum: "0",
+          creditNum: "0",
+          noticeNum: "0",
+          take_num: "0",
+        }
+      },
 			is_admin: {
 				type: Boolean,
 				default: false

pages/index/module/index_personal.vue

@@ -2,13 +2,14 @@
 	<view class="">
 		<view class="index_personal bg-rgba-255 r-20 bor-f1 row-justify-sb center p-40">
 			<view class="center">
-				<image class="wh-100 r-circle" src="/static/img/index/index-avatar.png" mode="">
+				<image class="wh-100 r-circle" v-if="memberData.head_img" src="/static/img/index/index-avatar.png" mode="aspectFill">
+				<image class="wh-100 r-circle" v-else :src="memberData.head_img" mode="aspectFill">
 				</image>
 				<view class="m-l20">
-					<text class="text-color-fff">HI，李亮</text>
+					<text class="text-color-fff">HI，{{ memberData.name ? memberData.name : memberData.nickname }}</text>
 					<view class="text-color-fff size-24 text-center r-20 line-30 p-tb6 p-lr20 m-t10 "
 						style="background-color: rgba(0, 0, 0, 0.2);opacity: 0.6;">
-						{{is_admin?'管理员':'业务员'}}
+						{{memberData.position_name?memberData.position_name:'无'}}
 					</view>
 				</view>
 			</view>
@@ -17,13 +18,14 @@
 		</view>
 		<uni-popup background-color="#fff" ref="popup" type="left" border-radius="10px 10px 0 0"
 			@touchmove.stop.prevent="moveHandle">
-			<SystemPopup ref="system" @onCloseSystem="onCloseSystem"></SystemPopup>
+			<SystemPopup ref="system" :member-data="memberData" ></SystemPopup>
 		</uni-popup>
 	</view>
 </template>
 
 <script>
 	import SystemPopup from "@/common/system_popup/system_popup.vue"
+  import {getMemberInfo} from "@/api/user";
 
 	export default {
 		name: 'index_personal',
@@ -40,7 +42,45 @@
 				default: () => {}
 			},
 		},
+    data(){
+      return{
+        memberData: {
+          position_name: "",
+          head_img: "",
+          id: 5,
+          name: "",
+          nickname: "",
+          phone: "",
+          status: 1,
+          user_type: 1,
+          accomplish_num: 0,
+          take_num: 0,
+          manage_num: 0,
+          use_num: 0,
+          end_num: 0,
+          grand_num: 0,
+        },
+      }
+    },
+    mounted() {
+      this.getMemberInfo();
+      uni.$on('updateMemberInfo', () => {
+        this.getMemberInfo();
+      })
+    },
 		methods: {
+      getMemberInfo() {
+        getMemberInfo({
+          'type': 1
+        }).then((res) => {
+          if (res.code === 1) {
+            this.memberData = res.data;
+            uni.setStorageSync('receivingType', res.data.receivingType)
+            uni.setStorageSync('enteringType', res.data.enteringType)
+            this.$emit('setMemberData',this.memberData)
+          }
+        })
+      },
 			onSystemShow() {
 				this.$refs.popup.open('left')
 			},