1. OA单的优化

yvan.ni
1 parent 0782b9f3
Showing 4 changed files with 14 additions and 14 deletions
components/diy_goodsGroup/diy_goodsGroup.wxml
components/diy_goodsGroup/diy_goodsGroup.wxss
packageA/pages/profile/profile.js
pages/template/index.js
@@ -534,8 +534,8 @@
     <!-- 列表显示 -->
     <view class="zs_goods_xiao_wai" wx:if='{{object.column==4}}'>
         <block wx:for="{{goods_array}}">
-            <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1">
-                <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}">
+            <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1 {{object.noboder==0?'list_border':'' }}">
+                <view class="zs_goods_xiao_bottom {{g_filter.get_border_type(object.big_order_type)}}">
                     <view class='zs_top_x'>
                         <block wx:if="{{object.big_order_type==3}}">
                             <view style="position: relative; width: 100%; height: 100%">
@@ -567,9 +567,8 @@
                             <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}" src='{{imghost}}/miniapp/images/Promotion.png'></image>
                         </block>
                     </view>
-
                     <view class='zs_center_x'>
-                        <view class='zs_wz1_x ellipsis-2' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
+                        <view class='zs_wz1_x ellipsis-2' style="width: 360rpx; margin-top: 10rpx" wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
                         <view class='zs_wz2_x' wx:if="{{object.goodsprice}}">
                             <block wx:if="{{item.prom_price || item.prom_integral}}">
@@ -698,7 +697,6 @@
 												</view>
                     </view>
-
                 </view>
             </navigator>
         </block>
@@ -139,7 +139,7 @@
   border-bottom: 2rpx #eee solid;
   /* padding: 10rpx; */
   background-color: white;
-	padding: 20rpx;
+	margin: 20rpx;
 	/* background-color: pink; */
 	box-sizing: border-box;
 }
@@ -149,7 +149,7 @@
   min-height: 300rpx;
   display: flex;
   /* border-bottom: 2rpx #eee solid; */
-  padding: 10rpx;
+  margin: 10rpx;
   background-color: white;
 }
@@ -901,6 +901,10 @@ top: 10rpx;
 	border-radius: 40rpx;
 }
+.zs_goods_xiao_wai{ padding-top:1rpx }
+.s1_gk_a1.list_border{ display: block; border-bottom: 1rpx solid #eee}
+
+
@@ -1126,10 +1126,10 @@ Page({
 			if(this.data.reg_info.introducer_state){
 				let tjrname = this.data.referee;
 				if (tjrname == "" || tjrname == null) {
-				  app.my_warnning("请输入推荐人", 0, this);
-				  return false;
+				  //app.my_warnning("请输入推荐人", 0, this);
+				  //return false;
 				};
-				data.tjrname=tjrname;						
+				if(tjrname) data.tjrname=tjrname;
 			}
 	    	//-- 需要姓名 --
@@ -1150,7 +1150,6 @@ Page({
 			   };
 			   data.sex=sex;
 			}
-			
 			//需要生日
 			if(this.data.reg_info.birthday_state){
 				let birthday = this.data.datet;
@@ -126,7 +126,7 @@ Page({
       var ob = {
           title: this.data.share_title,
           path: url,
-          imageUrl:this.data.url+this.data.store_config.store_logo,
+          //imageUrl:this.data.url+this.data.store_config.store_logo,
       };
       return ob;
   },
@@ -152,9 +152,8 @@ Page({
     var ob = {
         title:share_title,
-        //path: url,
         query:url,
-        imageUrl:this.data.url+store_config.store_logo,
+        //imageUrl:this.data.url+store_config.store_logo,
     };
     console.log(ob);
     return ob;