Merge branch 'dev' into 'test'

Dev See merge request !589

Merge branch 'dev' into 'test'
Dev See merge request !589
后端研发-苏明海
2 parents e1d2784b a43c2212
Showing 10 changed files with 85 additions and 298 deletions
app.json
components/diy_shopname/diy_shopname.wxml
components/diy_shopname/diy_shopname.wxss
images/share/miao_share.png
packageA/pages/prom_list/prom_list.js
pages/cart/cart2/cart2.js
pages/justTest/justTest.js
pages/justTest/justTest.json
pages/justTest/justTest.wxml
pages/justTest/justTest.wxss
 {
   "pages": [
     "pages/index/index/index",
-    "pages/justTest/justTest",
     "pages/goods/categoryList/categoryList",
     "pages/cart/cart/cart",
     "pages/cart/cart2/cart2",
@@ -86,11 +85,18 @@
     "pages/video/index",
     "pages/template/index",
     "pages/store/index",
-    "pages/user/choice_guide/choice_guide"
+    "pages/user/choice_guide/choice_guide",
+	"pages/cart/cart2_inte/cart2_inte",
+	"pages/giftpack/festival/festival",
+	"pages/team/team_more/team_more",
+	"pages/user/collect_list/collect_list",
+	"pages/user/deposit/deposit",
+	"pages/user/deposit/prepaid/msg/msg",
+	"pages/user/deposit/prepaid/prepaid"
   ],
   "plugins": {
     "live-player-plugin": {
-      "version": "1.1.1",
+      "version": "1.2.1",
       "provider": "wx2b03c6e691cd7370"
     }
   },
@@ -3,18 +3,20 @@
     <view class="big">
         <view class="big_picture_border">
-            <image class="big_picture" src='{{object.srcimg}}' binderror="berror" data-err="object.srcimg"></image>
+            <image mode="widthFix" style="display: block;" class="big_picture" src='{{object.srcimg}}' binderror="berror" data-err="object.srcimg"></image>
         </view>
         <block wx:if="{{object.style==1}}">
-            <view class="big_border">
+            <view style="position: relative; height: 150rpx;">
+            <view class="big_border" >
                 <view class="circle">
                     <view class="border">
-                        <image class="wxd_ww" src='{{sto}}' bindtap="go_user"></image>
+                        <image   class="wxd_ww" src='{{sto}}' bindtap="go_user"></image>
                     </view>
                 </view>
                 <view class="font">{{store_name}}</view>
             </view>
+			</view>
             <view class="all_view">
                 <view class="v_item" bindtap="go_all_wares">
@@ -36,8 +38,7 @@
             </view>
         </block>
-
-        <block wx:else="{{object.style==2}}">
+        <block wx:if="{{object.style==2}}">
             <view class="big_border_two">
                 <view class="circle_tow">
                     <view class="border">
@@ -48,35 +49,38 @@
                     <view class="fonts">{{store_name}}</view>
                 </view>
             </view>
-            <view class="base_font">
-                <view class="arrange">
-                    <view class="base_font_one">
-                        <navigator url="/pages/goods/goodsList/goodsList" class="navi">
-                            <view>{{total}}</view>
-                            <view>全部商品</view>
-                        </navigator>
-                    </view>
-
-                    <view class="base_font_one">
-                        <view class="shuxian">|</view>
-                        <navigator url="/pages/goods/goodsList/goodsList?is_new=1" class="navi">
-                            <view>{{new_total}}</view>
-                             <view>上新商品</view>
-                        </navigator>
-                    </view>
-
-                    <view class="base_font_one"  bindtap="go_user">
-                            <view class="shuxian">|</view>
-                            <view  class="navi">
-                                <view >
-                                    <image  class="user_pictrue_two" src='{{imghost}}/miniapp/images/numb.png'></image>
-                                </view>
-                                <view>个人中心</view>
-                            </view>
-                    </view>
-                </view>
-            </view>
         </block>
     </view>
+	
+	<block wx:if="{{object.style==2}}">
+		<view class="base_font">
+		    <view class="arrange">
+		        <view class="base_font_one">
+		            <navigator url="/pages/goods/goodsList/goodsList" class="navi">
+		                <view>{{total}}</view>
+		                <view>全部商品</view>
+		            </navigator>
+		        </view>
+		
+		        <view class="base_font_one">
+		            <view class="shuxian">|</view>
+		            <navigator url="/pages/goods/goodsList/goodsList?is_new=1" class="navi">
+		                <view>{{new_total}}</view>
+		                 <view>上新商品</view>
+		            </navigator>
+		        </view>
+		
+		        <view class="base_font_one"  bindtap="go_user">
+		                <view class="shuxian">|</view>
+		                <view  class="navi">
+		                    <view >
+		                        <image  class="user_pictrue_two" src='{{imghost}}/miniapp/images/numb.png'></image>
+		                    </view>
+		                    <view>个人中心</view>
+		                </view>
+		        </view>
+		    </view>
+		</view>
+    </block>
 </view>
@@ -4,7 +4,7 @@
   text-align:center;
   margin:0 auto;
   position: relative;
-  height: 500rpx;
+  /* height: 500rpx; */
 }
 .s1_gk_a1{
@@ -15,11 +15,9 @@
 /* 圆形小图片 */
 .wxd_ww {
-  width: 126rpx;
-  height: 126rpx;
+  width: 100%;
+  height: 100%;
   /* justify-content: center; */
-  margin-top: 20rpx;
-  margin-left: 6rpx;
 }
 /* 小图片圆边框 */
@@ -43,8 +41,8 @@
 /* 设置小图片外面的view的宽高 */
 .circle_tow .border {
-  width: 140rpx;
-  height: 140rpx;
+  width: 100%;
+  height: 100%;
 }
 /* 小图片最大外边框 */
@@ -52,7 +50,7 @@
 .big_border {
   width: 192rpx;
   height: 214rpx;
-  position: relative;
+  position: absolute;
   top: -82rpx;
   left: 10px;
 }
@@ -69,7 +67,7 @@
 .big_picture_border {
   width: 100%;
-  height: 320rpx;
+  /* height: 320rpx; */
 }
@@ -140,9 +138,10 @@ left:-116rpx;
 .big_border_two {
   width: 100%;
   height: 260rpx;
-  position: relative;
-  top: -274rpx;
+  position: absolute;
+  top: -130rpx;
   text-align: center;
+  margin-top: 50%;
 }
 /* 小图片2圆边框 */
@@ -189,7 +188,6 @@ left:-116rpx;
   width: 100%;
   height: 120rpx;
   position: relative;
-  top: -250rpx;
 }
 /* 使里面的view纵向排列 */
 .arrange{
@@ -223,11 +221,11 @@ left:-116rpx;
 }
 .wai_zwp{
   background-color: white;
-  height: 500rpx;
+  /* height: 500rpx; */
 }
 .shopname_title_size{ font-size: 34rpx}
-.big .all_view{display: flex; width: 500rpx; position:absolute; bottom:90rpx;right: 0 }
+.big .all_view{display: flex; width: 500rpx; position:absolute; bottom:rpx;right: 0 }
 .big .all_view .v_item{width:33%; }
 .big_border_two .title_center{ display: flex; justify-content: center;}
@@ -241,20 +241,22 @@ Page({
 			  }else{
 				  ee.setData({ data: t.data.data, });			  
 			  }
-			  		  
-			  /*---获取活动的重表---*/
-			  //调用接口判断订单优惠，
-			  getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+ee.data.gid+"/2", {}).then(res => {
-			       if(res.data.code==0){
-			  				var r_data=res.data.data;
-							th.loop_promise(0,r_data.collocationList,function(){
-								ee.setData({
-									 collocationGoods:r_data.collocationPromList,
-									 collocationList:r_data.collocationList,
-								})
-							}) 	  				
-			  			} 
-			  }) 
+			  
+			  if(!ee.data.collocationList){
+				  /*---获取活动的重表---*/
+				  //调用接口判断订单优惠，
+				  getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+ee.data.gid+"/2", {}).then(res => {
+					   if(res.data.code==0){
+								var r_data=res.data.data;
+								th.loop_promise(0,r_data.collocationList,function(){
+									ee.setData({
+										 collocationGoods:r_data.collocationPromList,
+										 collocationList:r_data.collocationList,
+									})
+								}) 	  				
+							} 
+				  }) 
+			  }
 		      //获取统一条形码,普通商品和优惠促销的商品
 		      if ( t.data.data.prom_type == 5){
@@ -274,7 +276,7 @@ Page({
 											  }
 											  //---通过接口获取门店的线下库存信息--
 											  return  getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
-												  data:{storageNos:that.data.fir_def_store.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid}		  
+												  data:{storageNos:that.data.fir_def_store.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid,pageSize:2000}		  
 									          })
 									}).then(res=>{
 										if(res.data.code==0 && res.data.data.total>0){
@@ -414,7 +416,7 @@ Page({
 			var pick=th.get_pick_from_list(th.data.sto_sele_id)
 			//---通过接口获取门店的线下库存信息--
 			getApp().request.get("/api/weshop/goods/getWareStorages",{
-				  data:{storageNos:pick.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid},
+				  data:{storageNos:pick.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid,pageSize:2000},
 				  success:function(res){
 					 if(res.data.code==0){																	 
 						   if(res.data.data.pageData.length>0){
@@ -943,7 +945,7 @@ Page({
 		  }
 		  //---通过接口获取门店的线下库存信息--
 		  return  getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
-		      data:{storageNos:pkno_str,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid}		  
+		      data:{storageNos:pkno_str,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid,pageSize:2000}		  
 	      })
 	  }).then(res=>{	
 			  if(res.data.code==0){				   
@@ -1301,7 +1303,7 @@ Page({
 		  })		  
 		  //读取线下的门店库存
 		  await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
-		  		  data:{storageNos:item.pickup_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid}
+		  		  data:{storageNos:item.pickup_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid,pageSize:2000}
 		  }).then(res=>{
 		  		  if(res.data.code==0 && res.data.data.total>0){
 		  			  plist=res.data.data.pageData[0];		 
@@ -668,7 +668,10 @@ Page({
                       th.setData({collocation_goods:gg.collocation_goods});
                       var cart_arr=new  Array();
-                      var narr=gg.collocation_goods;
+                      //var narr=gg.collocation_goods;	
+					  //修改成深拷贝，确保返回是数据正确					
+					  var narr=JSON.parse(JSON.stringify(gg.collocation_goods));	
+					 				  
                       narr.push(t.data.data);
                       var ie = {
                          pickup_id: gg.pick_id, pname: gg.pick_name, goods: narr, exp_type: et, wind: m_wind, distr_t: distr_t,
@@ -2170,7 +2173,7 @@ Page({
 		  })
 	  	  //读取线下的门店库存 
 	  	  await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
-	  		  data:{storageNos:pick_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid}
+	  		  data:{storageNos:pick_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid,pageSize:2000}
 	  	  }).then(res=>{
 	  		  if(res.data.code==0){
 	  			  plist=res.data.data.pageData[0];		 
@@ -2845,8 +2848,10 @@ Page({
       //getApp().waitfor2(this,"g_cart_q_time","order_prom_list_cart",async function () {
           //var arr=th.data.order_prom_list_cart;
 		  var arr=order_prom_list_cart;
+		  if(!arr) arr=[];
           //如果系统有限制使用优惠券
           if(th.data.is_close_quan) return false;
+		
           //------------开始计算使用优惠券相关------------
           for(var ind in arr){
               var ep=arr[ind];
-// pages/justTest/justTest.js
-// let livePlayer = requirePlugin('live-player-plugin');
-
-
-var t = require("../../utils/util.js"),
-  ut = t,
-  e = require("../../utils/common.js"),
-  a = require("../../utils/wxParse/wxParse.js"),
-  s = getApp(),
-  i = s.request,
-  rq = i,
-  oo = s.globalData,
-  o = s.globalData.setting,
-  os = o;
-var utils = require('../../utils/util.js'),ut=utils;
-var regeneratorRuntime = require('../../utils/runtime.js');
-
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    gid: "",
-    stoid: o.stoid,
-    url: o.url,
-    resourceUrl: o.resourceUrl,
-    iurl: o.imghost,
-    defaultAvatar: o.resourceUrl + "/static/images/user68.jpg",
-    data: null,
-    openSpecModal: !1,
-    openPromModal: !1,
-    supportPageScroll: !1,
-
-    //联系电话
-    mobile: '',
-    bconfig:null,
-    sales_rules:1,
-
-    t_time:null,
-	card_field:"",
-	dp_price:0,
-	cut_price:0,
-	open_ind_store:1,
-	goodsInputNum:1,
-	g_buy_num: null,
-  sele_collocation:null,
-  
-
-
-  photoUrl: "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1003256280,1176261798&fm=26&gp=0.jpg",
-    //（用来控制显示哪个按钮） false表示还没首次进行弹框授权，或者已经授权了；true表示在首次授权弹框时拒绝授权，或者在设置页面还是拒绝了授权
-    isAuthSavePhoto: false
-  },
-
-
-
-
-
-  sendRequest: function () {
-   
-   
-  
-     //调用接口判断是不是会员
-     getApp().request.promiseGet("/api/weshop/wx/livelist/page",{
-      data:{store_id: 1}
-  }).then(res=>{
-       console.log(res);
-      // if(res.data.code==0){
-      //   getApp().globalData.guide_id=res.data.data.id;
-      // }
-    })
-   
-  },
-  // nav: function () {
-  //   wx.redirectTo({
-  //     url: '/packageA/pages/liveStream/liveStream'
-  //   })
-  // },
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  },
-
-
-
-
-  saveImage() {
-    wx.showLoading({
-      title: '保存中...', 
-      mask: true,
-    });
-    wx.downloadFile({
-      url:
-  'http://upload.jianshu.io/admin_banners/web_images/4435/c1d3ca63353c8bd527f0d781605516cb5b266d02.jpg?imageMogr2/auto-orient/strip|imageView2/1/w/1250/h/540',
-      success: function(res) {
-        if (res.statusCode === 200) {
-          let img = res.tempFilePath;
-          wx.saveImageToPhotosAlbum({
-            filePath: img,
-            success(res) {
-              wx.showToast({
-                title: '保存成功',
-                icon: 'success',
-                duration: 2000
-              });
-            },
-            fail(res) {
-              wx.showToast({
-                title: '保存失败',
-                icon: 'success',
-                duration: 2000
-              });
-            }
-          });
-        }
-      }
-    });
-  },
-
-
-
-  live() {}
-
-
-})
 \ No newline at end of file
-{
-  "usingComponents": {}
-}
 \ No newline at end of file
-<!--pages/justTest/justTest.wxml-->
-<text>pages/justTest/justTest.wxml</text>
-<navigator url="/packageA/pages/liveStream/liveStream">进入直播</navigator>
-<navigator url="/packageA/pages/liveStreamDetails/liveStreamDetails">进入直播详情页</navigator>
-<button bindtap="sendRequest">发送请求</button>
-
-
-
-
-<button open-type="share" class='iconfont icon-weixin'>分享</button>
-<button bindopensetting="onOpenSetting" open-type="openSetting" > 
-	保存图片到手机
-</button>
-
-
-
-
-<button bindtap="showac"></button>
-
-/* pages/justTest/justTest.wxss */
-page {
-  background: #fff;
-  text-align: center;
-}
-
-.box {
-  padding: 30rpx 80rpx;
-}
-
-.img {
-  width: 430rpx;
-  height: 430rpx;
-  margin: 20rpx 0;
-}
-button {
-  width: 100%;
-  background: #ffffff;
-  border: none;
-  border-radius: 0rpx;
-  padding: 0;
-  margin: 0;
-}
-
-.btn {
-  background: green;
-  color: #ffffff;
-  border-radius: 0;
-}
 \ No newline at end of file