From 09e74ee4e12011b35b579a3bc0d3af7f556cb921 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 1 Sep 2023 14:27:50 +0800
Subject: [PATCH] OA单的优化

---
 components/nodata/nodata.js                         | 12 +++++++++++-
 components/nodata/nodata.wxml                       |  2 +-
 packageA/pages/chongzhiDetails/chongzhiDetails.js   | 15 +++++++++++++--
 packageA/pages/chongzhiDetails/chongzhiDetails.wxml | 30 ++++++++++++++++++++++--------
 packageA/pages/chongzhiDetails/g_filter.wxs         |  7 ++++++-
 packageD/pages/user/deposit/prepaid/prepaid.js      |  9 ++++++++-
 packageD/pages/user/deposit/prepaid/prepaid.json    |  5 ++++-
 packageD/pages/user/deposit/prepaid/prepaid.wxml    |  5 +++++
 packageD/pages/user/deposit/prepaid/prepaid.wxss    |  3 +++
 pages/user/userinfo/userinfo.js                     |  1 +
 pages/user/userinfo/userinfo.wxml                   |  8 ++++++++
 11 files changed, 82 insertions(+), 15 deletions(-)

diff --git a/components/nodata/nodata.js b/components/nodata/nodata.js
index 9752283..7080d89 100644
--- a/components/nodata/nodata.js
+++ b/components/nodata/nodata.js
@@ -1,5 +1,15 @@
 Component({
-	externalClasses: ['nodata-container'],
+  externalClasses: ['nodata-container'],
+  //在.js文件中
+  properties: {
+    // 简单的定义方式
+    // max:Number
+    // 完整的定义方式
+    title:{
+      type:String,
+      value:''
+    }
+  },
   /*** 页面的初始数据***/
   data: {
 
diff --git a/components/nodata/nodata.wxml b/components/nodata/nodata.wxml
index 536a987..8b3e531 100644
--- a/components/nodata/nodata.wxml
+++ b/components/nodata/nodata.wxml
@@ -1,4 +1,4 @@
 <view class="nodata-container">
 	<view class="nodata-icon iconfont icon-nodata"></view>
-	<view class="nodata-title">暂无数据</view>
+	<view class="nodata-title">{{title?title:'暂无数据'}}</view>
 </view>
diff --git a/packageA/pages/chongzhiDetails/chongzhiDetails.js b/packageA/pages/chongzhiDetails/chongzhiDetails.js
index 05ae07f..255d2e6 100644
--- a/packageA/pages/chongzhiDetails/chongzhiDetails.js
+++ b/packageA/pages/chongzhiDetails/chongzhiDetails.js
@@ -23,6 +23,7 @@ Page({
    */
   onLoad: function (options) {
 
+	   wx.showLoading();
 	   const self = this;		
 	   if(options.type)
 	      self.setData({type:options.type});
@@ -50,11 +51,11 @@ Page({
 		
 		   
 	   getApp().request.promiseGet("/api/weshop/ad/page",{
-		 data:{store_id:os.stoid,enabled:1,pid:601}  
+		 data:{store_id:os.stoid,enabled:1,pid:1210}
 	   }).then(res=>{
 		   if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){
 			   var a = res.data.data.pageData;			   
-			   self.setData({show_img:a[0].ad_code,ad_color:a[0].bgcolor});
+			   self.setData({show_img:a[0].ad_code,ad_color:a[0].bgcolor,ad:a[0] });
 		   }
 	   })	
 	   
@@ -94,6 +95,8 @@ Page({
 				self.setData({
 					result: result,
 				});
+
+				wx.hideLoading();
 			
 		  },
 		});
@@ -276,4 +279,12 @@ Page({
 	            }
 	        })
 	  },
+
+
+	go_url:function (e){
+        var url=e.currentTarget.dataset.url;
+		if(url){
+           getApp().goto(url);
+		}
+	}
 })
\ No newline at end of file
diff --git a/packageA/pages/chongzhiDetails/chongzhiDetails.wxml b/packageA/pages/chongzhiDetails/chongzhiDetails.wxml
index 055d1fe..25fdc9b 100644
--- a/packageA/pages/chongzhiDetails/chongzhiDetails.wxml
+++ b/packageA/pages/chongzhiDetails/chongzhiDetails.wxml
@@ -3,16 +3,30 @@
 <view class="container">
 	<view>
 		<view class="banner-container" wx:if="{{show_img}}">
-			<image class="img-block" src="{{url+show_img}}" mode="widthFix"
-		       lazy-load="true" binderror="bind_err" data-errorimg="show_img" ></image></view>
+
+			<navigator url="{{item.ad_weapplink}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(ad.ad_weapplink,'plugin')>=0}}">
+		    	<image class="img-block" src="{{url+show_img}}" mode="widthFix"
+		         lazy-load="true" binderror="bind_err" data-errorimg="show_img" ></image>
+			</navigator>
+
+			<block wx:else>
+				<image class="img-block" src="{{url+show_img}}" mode="widthFix" bindtap="go_url"
+					   data-url="{{ad.ad_weapplink}}"
+					   lazy-load="true" binderror="bind_err" data-errorimg="show_img" ></image>
+			</block>
+
+
+		</view>
+
+		<view class="title-container" wx:else>
+			<view class="title">
+				<view>女王专享</view>
+				<view>你的美丽我来缔造</view>
+			</view>
+		</view>
 					
 		<view class="list">
-			<view class="title-container">
-				<view class="title">
-					<view>女王专享</view>
-					<view>你的美丽我来缔造</view>
-				</view>
-			</view>
+
 			<view >			
 				<view class="list-item flex" wx:for="{{result.givelist}}">									
 					<!-- 左图片 -->
diff --git a/packageA/pages/chongzhiDetails/g_filter.wxs b/packageA/pages/chongzhiDetails/g_filter.wxs
index f9bd741..f924278 100644
--- a/packageA/pages/chongzhiDetails/g_filter.wxs
+++ b/packageA/pages/chongzhiDetails/g_filter.wxs
@@ -6,6 +6,11 @@ var is_acting = function(endtime){
   var bijiao = getDate(endtime) - getDate(); 
   return bijiao > 0 ? true : false;
 }
+var has_char=function(url,key){
+  if(!url)	return -1;
+  return url.indexOf(key);
+}
 module.exports = {
-	is_acting:is_acting  
+	is_acting:is_acting,
+    has_char:has_char,
 }
\ No newline at end of file
diff --git a/packageD/pages/user/deposit/prepaid/prepaid.js b/packageD/pages/user/deposit/prepaid/prepaid.js
index 4aaf90e..4b97d93 100644
--- a/packageD/pages/user/deposit/prepaid/prepaid.js
+++ b/packageD/pages/user/deposit/prepaid/prepaid.js
@@ -13,7 +13,8 @@ Page({
         iurl: o.imghost,
         showModal: false, //弹框控制器
         perpaid: [], //数据,
-        paying:0
+        paying:0,
+        is_get:0
       },
       onLoad:function (){
           //定义第一次进入
@@ -50,6 +51,9 @@ Page({
       },
       /*预存款的劵*/
       async yuck() {
+
+
+        wx.showLoading();
         var user_id = getApp().globalData.user_id;
         var store_id = os.stoid;
         console.log(user_id, "有进来吗银行卡", store_id );
@@ -68,6 +72,9 @@ Page({
           e.setData({
             perpaid: perpaids,is_get:1
           });
+
+          wx.hideLoading();
+
         })
 
       },
diff --git a/packageD/pages/user/deposit/prepaid/prepaid.json b/packageD/pages/user/deposit/prepaid/prepaid.json
index 8835af0..b71c846 100644
--- a/packageD/pages/user/deposit/prepaid/prepaid.json
+++ b/packageD/pages/user/deposit/prepaid/prepaid.json
@@ -1,3 +1,6 @@
 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "usingComponents": {
+    "nodata": "/components/nodata/nodata"
+  }
 }
\ No newline at end of file
diff --git a/packageD/pages/user/deposit/prepaid/prepaid.wxml b/packageD/pages/user/deposit/prepaid/prepaid.wxml
index b0f0384..2a48d15 100644
--- a/packageD/pages/user/deposit/prepaid/prepaid.wxml
+++ b/packageD/pages/user/deposit/prepaid/prepaid.wxml
@@ -38,6 +38,11 @@
   
 </block>
 
+
+<view wx:if="{{perpaid.length==0 && is_get}}" style="text-align: center;">
+	<nodata title="暂无充值活动" nodataContainer="nodata"></nodata>
+</view>
+
   <view class="mask" catchtouchmove="preventTouchMove" wx:if="{{showModal}}"></view>
   <view class="big-rim modalDlg" wx:if="{{showModal}}">
     <view class="gb-rim" bindtap="shut">
diff --git a/packageD/pages/user/deposit/prepaid/prepaid.wxss b/packageD/pages/user/deposit/prepaid/prepaid.wxss
index d027d41..c8e7c6e 100644
--- a/packageD/pages/user/deposit/prepaid/prepaid.wxss
+++ b/packageD/pages/user/deposit/prepaid/prepaid.wxss
@@ -1,3 +1,6 @@
+image{
+    height:auto;
+}
 /* 图片 */
 .picture{
 /* margin-top: 5rpx; */
diff --git a/pages/user/userinfo/userinfo.js b/pages/user/userinfo/userinfo.js
index 370e3a3..90cbd04 100644
--- a/pages/user/userinfo/userinfo.js
+++ b/pages/user/userinfo/userinfo.js
@@ -792,6 +792,7 @@ Page({
         if(choice_guide){
           a.staffName=choice_guide.StaffName;
           a.staffId=choice_guide.Id;
+          a.staffTel=choice_guide.Tel;
         }
 
 
diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml
index bd35eaa..4b21b03 100644
--- a/pages/user/userinfo/userinfo.wxml
+++ b/pages/user/userinfo/userinfo.wxml
@@ -238,6 +238,14 @@
         </view>
       </view>
 
+      <view wx:if="{{user.staffTel}}" class="user-name flex-vertical-between">
+        <view class="user-name-txt">{{guide_title}}电话</view>
+        <view class="flex-center user-txt-right">
+          <view class="one-line">{{user.staffTel}}</view>
+        </view>
+
+      </view>
+
 
 
     </view>
--
libgit2 0.21.4