Revert "OA单的优化"

This reverts commit 09e74ee4e12011b35b579a3bc0d3af7f556cb921.

Revert "OA单的优化"
This reverts commit 09e74ee4e12011b35b579a3bc0d3af7f556cb921.
yvan.ni
1 parent 09e74ee4
Showing 11 changed files with 15 additions and 82 deletions
components/nodata/nodata.js
components/nodata/nodata.wxml
packageA/pages/chongzhiDetails/chongzhiDetails.js
packageA/pages/chongzhiDetails/chongzhiDetails.wxml
packageA/pages/chongzhiDetails/g_filter.wxs
packageD/pages/user/deposit/prepaid/prepaid.js
packageD/pages/user/deposit/prepaid/prepaid.json
packageD/pages/user/deposit/prepaid/prepaid.wxml
packageD/pages/user/deposit/prepaid/prepaid.wxss
pages/user/userinfo/userinfo.js
pages/user/userinfo/userinfo.wxml
 Component({
-  externalClasses: ['nodata-container'],
-  //在.js文件中
-  properties: {
-    // 简单的定义方式
-    // max:Number
-    // 完整的定义方式
-    title:{
-      type:String,
-      value:''
-    }
-  },
+	externalClasses: ['nodata-container'],
   /*** 页面的初始数据***/
   data: {
 <view class="nodata-container">
 	<view class="nodata-icon iconfont icon-nodata"></view>
-	<view class="nodata-title">{{title?title:'暂无数据'}}</view>
+	<view class="nodata-title">暂无数据</view>
 </view>
@@ -23,7 +23,6 @@ Page({
    */
   onLoad: function (options) {
-	   wx.showLoading();
 	   const self = this;		
 	   if(options.type)
 	      self.setData({type:options.type});
@@ -51,11 +50,11 @@ Page({
 	   getApp().request.promiseGet("/api/weshop/ad/page",{
-		 data:{store_id:os.stoid,enabled:1,pid:1210}
+		 data:{store_id:os.stoid,enabled:1,pid:601}  
 	   }).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,ad:a[0] });
+			   self.setData({show_img:a[0].ad_code,ad_color:a[0].bgcolor});
 		   }
 	   })	
@@ -95,8 +94,6 @@ Page({
 				self.setData({
 					result: result,
 				});
-
-				wx.hideLoading();
 		  },
 		});
@@ -279,12 +276,4 @@ Page({
 	            }
 	        })
 	  },
-
-
-	go_url:function (e){
-        var url=e.currentTarget.dataset.url;
-		if(url){
-           getApp().goto(url);
-		}
-	}
 })
 \ No newline at end of file
@@ -3,30 +3,16 @@
 <view class="container">
 	<view>
 		<view class="banner-container" wx:if="{{show_img}}">
-
-			<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>
+			<image class="img-block" src="{{url+show_img}}" mode="widthFix"
+		       lazy-load="true" binderror="bind_err" data-errorimg="show_img" ></image></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}}">									
 					<!-- 左图片 -->
@@ -6,11 +6,6 @@ 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,
-    has_char:has_char,
+	is_acting:is_acting  
 }
 \ No newline at end of file
@@ -13,8 +13,7 @@ Page({
         iurl: o.imghost,
         showModal: false, //弹框控制器
         perpaid: [], //数据,
-        paying:0,
-        is_get:0
+        paying:0
       },
       onLoad:function (){
           //定义第一次进入
@@ -51,9 +50,6 @@ Page({
       },
       /*预存款的劵*/
       async yuck() {
-
-
-        wx.showLoading();
         var user_id = getApp().globalData.user_id;
         var store_id = os.stoid;
         console.log(user_id, "有进来吗银行卡", store_id );
@@ -72,9 +68,6 @@ Page({
           e.setData({
             perpaid: perpaids,is_get:1
           });
-
-          wx.hideLoading();
-
         })
       },
 {
-  "usingComponents": {},
-  "usingComponents": {
-    "nodata": "/components/nodata/nodata"
-  }
+  "usingComponents": {}
 }
 \ No newline at end of file
@@ -38,11 +38,6 @@
 </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">
-image{
-    height:auto;
-}
 /* 图片 */
 .picture{
 /* margin-top: 5rpx; */
@@ -792,7 +792,6 @@ Page({
         if(choice_guide){
           a.staffName=choice_guide.StaffName;
           a.staffId=choice_guide.Id;
-          a.staffTel=choice_guide.Tel;
         }
@@ -238,14 +238,6 @@
         </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>