Merge branch 'master' of http://115.29.66.169:10080/qingyunhui/app

app.js

@@ -8,8 +8,8 @@ App({
    * 全局变量
    */
   // apiRoot: "https://wj.songlanyun.com/wjxy/api/", // 正式环境api地址
-  // apiRoot: 'http://192.168.0.181:8687/qyh/api/',
-  apiRoot: 'http://192.168.0.193:8687/qyh/api/',
+  apiRoot: 'http://192.168.0.181:8687/qyh/api/',
+  // apiRoot: 'http://192.168.0.193:8687/qyh/api/',
   // apiRoot: 'http://192.168.0.232:8687/wjxy/api/', //黄理志
   // apiRoot: 'http://192.168.0.186:8687/wjxy/api/',
   siteInfo: require("siteinfo.js"),

pages/dashen/index.wxss

@@ -143,7 +143,7 @@ page {
 }
 .hang-item .info-box {
   flex: 1;
-  margin-left: 10rpx;
+  margin-left: 20rpx;
 }
 
 .hang-item .per-img {
@@ -204,6 +204,7 @@ page {
   flex-shrink: 0;
   justify-content: flex-end;
 }
+
 .hang-item-address .address-word {
   font-size: 24rpx;
   font-family: FZZhunYuan-M02S;

pages/home/index/index.wxml

@@ -1,9 +1,10 @@
 <import src="template/volunteer-template/volunteer-template.wxml" />
 <import src="template/growth-template/growth-template.wxml" />
-<view class="home">
-  <view style="background: linear-gradient(180deg, #e2eaff 0%, #F7F8FA 100%);">
+<view class="home" style="background-image: url('/assets/images/home/icon_bg1.png');">
+  <!--background: linear-gradient(180deg, #e2eaff 0%, #F7F8FA 100%);-->
+  <view>
     <view style="width:100%;height:{{statusBarHeight}};"></view>
-    <view class="diy-top" style="height:{{statusBarHeight}};padding-top:{{statusBarHeightTop}}">
+    <view class="diy-top" style="height:{{statusBarHeight}};padding-top:{{statusBarHeightTop}};background: {{activeTitle ? 'linear-gradient(180deg, #cad8ff 0%, #e7edfe 100%)' : ''}};">
       <view class="title">青雲慧</view>
       <view class="index-wrap-box">
         <view class="index-container">

pages/home/index/index.wxss

@@ -21,6 +21,9 @@
   display: flex;
   flex-direction: column;
   position: relative;
+  background-size: 100% 806rpx;
+  background-repeat: no-repeat;
+  /* background-position: center; */
 }
 
 .slide-box {
@@ -253,7 +256,7 @@
   box-sizing: border-box;
   padding-bottom: 12rpx;
   /* background-image: linear-gradient(0deg, #ffffff 10%, #fff9e0 100%); */
-  background: linear-gradient(180deg, #cad8ff 0%, #e7edfe 100%);
+  /* background: linear-gradient(180deg, #cad8ff 0%, #e7edfe 100%); */
 }
 
 .diy-top .logo {

pages/my/myData/myData.js

@@ -56,7 +56,7 @@ Page({
 		},
 
 		isDev: true, //开发环境隐藏"编辑资料"页面的部分数据项
-		formKey: []
+		formNum: 0
 	},
 	/**
 	 * 防止穿透
@@ -840,6 +840,7 @@ Page({
 		}
 
 		this.loadVipSel();
+		this.getNum();
 	},
 
 	/**
@@ -1018,5 +1019,20 @@ Page({
 				}
 			}
 		)
-	}
+	},
+	// 获取已填写的会员信息个数
+	getNum() {
+		let id = util.getUserId();
+		let _this = this;
+		App._get('member/completeNum/' + id, 'application/json',
+			null,
+			function (res) {
+				if (res.code === 0) {
+					_this.setData({
+						formNum: res.data || 0
+					})
+				}
+			}
+		)
+	},
 })

pages/my/myData/myData.wxml

@@ -295,8 +295,8 @@
   <view class="flex-btn">
     <view class="notice">
       完善所有信息可得积分奖励，完善程度
-      <text class="num">7</text>
-      /15
+      <text class="num">{{formNum}}</text>
+      /13
     </view>
     <view class="flex-btn-view">
       <view class='cancel' bindtap='btnCancel'>取消</view>