From 3ab8dba1d3579c986acad4bc1c0628d195f35d79 Mon Sep 17 00:00:00 2001
From: taiyuan <taiyuan@yolipai.com>
Date: Mon, 26 Apr 2021 18:06:28 +0800
Subject: [PATCH] 个人信息加载默认数据

---
 packageA/pages/profile/profile.js   | 32 +++++++++++++++++++++-----------
 packageA/pages/profile/profile.wxml |  4 ++--
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js
index 111b618..f918a9e 100644
--- a/packageA/pages/profile/profile.js
+++ b/packageA/pages/profile/profile.js
@@ -529,20 +529,11 @@ Page({
   },
   //------初始化加载----------
   onLoad: function(t) {
-    // var user = getApp().globalData.userInfo;
-    // if (user.card_field != '' && user.card_field != null && user.card_field != undefined && user.card_expiredate) {
-    //   var now = ut.gettimestamp();
-    //   var str = user.card_expiredate.replace(/-/g, '/');;
-    //   var end = new Date(str);
-    //   end = Date.parse(end) / 1000;
-    //   if (now < end) {
-    //     this.puls_user();
-    //   }
-    // };
-    // this.initial_user();
+
 		self = this;
 		let url1 = '/api/weshop/storeconfig/get/';
 		let url2 = '/api/weshop/prom/coupon/get/';
+		let url3 = '/api/weshop/users/getERPUser/';
 		url1 += r.stoid;
 		
 		app.request.get(url1, {
@@ -579,6 +570,25 @@ Page({
 		});
 		
 		
+		//获取默认信息
+		url3 += r.stoid + "/" + app.globalData.user_id;
+		app.request.get(url3, {
+			success: function(res) {
+				if(res.data.code == 0) {
+					console.log('url3', res.data.data.birthday);
+					let data = res.data.data;
+					self.setData({
+						isGender: data.sex,
+						isLunar: data.islunar,
+						datet: data.birthday,
+						stoname: data.pickup_name,
+						sto_sele_id: data.pickup_id,
+					});
+				};
+			}
+		});
+		
+		
   },
 
 
diff --git a/packageA/pages/profile/profile.wxml b/packageA/pages/profile/profile.wxml
index 6b9cbf2..83e9160 100644
--- a/packageA/pages/profile/profile.wxml
+++ b/packageA/pages/profile/profile.wxml
@@ -70,11 +70,11 @@
 			    <view class="user-txt-right pdl20 flex ai-center">
 							<checkbox-group bindchange="isLunar">
 								<label class="flex ai-center">
-									<checkbox value="{{isLunar}}"/>农历
+									<checkbox value="{{isLunar}}" checked="{{isLunar}}"/>农历
 								</label>
 							</checkbox-group>
 			        <picker class="pdl20" bindchange='bindChange' mode="date" start="{{year-70}}-1-1" end="{{year}}-12-31">
-								<view class="flex ai-center">{{datet?datet:"请选择时间"}}<view class="angle">∟</view></view>
+								<view class="flex ai-center">{{datet? filters.format_time(datet):"请选择时间"}}<view class="angle">∟</view></view>
 			        </picker>
 
 			
--
libgit2 0.21.4