wxd / MShopWeApp

Commit 46f28af9cdc54bd7809ce42e9af2fc0c5f9d8d19

Authored by taiyuan
2 parents fbfe3f5c c07287c2

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

Inline Side-by-side
Showing 14 changed files with 197 additions and 155 deletions
components/diy_goodsGroup/diy_goodsGroup.js
  View file @46f28af
... ... @@ -211,6 +211,8 @@ Component({
211 211 pageSize: th.data.goodscount,
212 212 page: th.data.currentPage,
213 213 isonsale: 1,
  214 + orderField: "sort",
  215 + orderType: 'asc',
214 216 };
215 217 if(th.data.is_recommend) r_data.is_recommend=th.data.is_recommend;
216 218 if(th.data.is_hot) r_data.is_hot=th.data.is_hot;
... ... @@ -241,6 +243,8 @@ Component({
241 243 pageSize: th.data.goodscount,
242 244 page: th.data.currentPage,
243 245 isonsale: 1,
  246 + orderField: "sort",
  247 + orderType: 'asc',
244 248 }
245 249 }).then(res => {
246 250 th.data.loading=0;
... ...
components/goods_list/goods_list.js
  View file @46f28af
... ... @@ -21,9 +21,8 @@ Component({
21 21 properties: {
22 22 // 这⾥定义了innerText属性，属性值可以在组件使⽤时指定
23 23 },
24   - ready: function () {
25   - },
26   - pageLifetimes:{
  24 + ready: function () {},
  25 + pageLifetimes: {
27 26 //要处理一下，游客登录后的界面的变化,主要还该是改变会员
28 27 show: function () {
29 28 this.init();
... ... @@ -33,55 +32,55 @@ Component({
33 32 methods: {
34 33 init: function () {
35 34 var th = this;
36   - if(!getApp().globalData.user_id) return false;
  35 + if (!getApp().globalData.user_id) return false;
37 36 getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
38   - isShowLoading:false,
  37 + isShowLoading: false,
39 38 success: function (e) {
40   - if(e.data.code==0 && e.data && e.data.data){
41   - getApp().globalData.userInfo = e.data.data;
42   - getApp().getConfig2(function (e) {
43   - var swithc_list = e.switch_list;
44   - var sw_arr = JSON.parse(swithc_list);
45   - //---如果后台有开等级卡的开关---
46   - if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
47   - th.setData({
48   - rank_switch: true
49   - });
50   - //---回调卡的列表---
51   - th.getPlusCardType(function (ob) {
52   - th.setData({
53   - card_list: ob.card_list
54   - });
55   - var ti = setInterval(function () {
56   - var user = getApp().globalData.userInfo;
57   - if (!user) return false;
58   - clearInterval(ti);
59   - if (user.card_field && user['card_expiredate']) {
60   - var str = user['card_expiredate'].replace(/-/g, '/');
61   - var end = new Date(str);
62   - end = Date.parse(end) / 1000;
63   - var now = ut.gettimestamp();
64   - //--- 判断是等级会员，且在有效期范围内 ---
65   - if (user.card_field && now < end) {
66   - var card_name = ob.name_map.get(user.card_field);
67   - if (card_name.length > 4) card_name = card_name.substring(0, 8);
68   - th.setData({
69   - card_field: user.card_field,
70   - card_name: card_name,
71   - card_list: ob.card_list
72   - });
73   - }
74   - }
75   - }, 500)
76   - })
77   - }
78   - })
79   -
80   - }
81   -
82   -
83   -
84   - }
  39 + if (e.data.code == 0 && e.data && e.data.data) {
  40 + getApp().globalData.userInfo = e.data.data;
  41 + getApp().getConfig2(function (e) {
  42 + var swithc_list = e.switch_list;
  43 + var sw_arr = JSON.parse(swithc_list);
  44 + //---如果后台有开等级卡的开关---
  45 + if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
  46 + th.setData({
  47 + rank_switch: true
  48 + });
  49 + //---回调卡的列表---
  50 + th.getPlusCardType(function (ob) {
  51 + th.setData({
  52 + card_list: ob.card_list
  53 + });
  54 + var ti = setInterval(function () {
  55 + var user = getApp().globalData.userInfo;
  56 + if (!user) return false;
  57 + clearInterval(ti);
  58 + if (user.card_field && user['card_expiredate']) {
  59 + var str = user['card_expiredate'].replace(/-/g, '/');
  60 + var end = new Date(str);
  61 + end = Date.parse(end) / 1000;
  62 + var now = ut.gettimestamp();
  63 + //--- 判断是等级会员，且在有效期范围内 ---
  64 + if (user.card_field && now < end) {
  65 + var card_name = ob.name_map.get(user.card_field);
  66 + if (card_name.length > 4) card_name = card_name.substring(0, 8);
  67 + th.setData({
  68 + card_field: user.card_field,
  69 + card_name: card_name,
  70 + card_list: ob.card_list
  71 + });
  72 + }
  73 + }
  74 + }, 500)
  75 + })
  76 + }
  77 + })
  78 +
  79 + }
  80 +
  81 +
  82 +
  83 + }
85 84 })
86 85 },
87 86 // get_list: function () {
... ... @@ -96,51 +95,51 @@ Component({
96 95 // }
97 96 // })
98 97 // },
99   - get_list: function() {
100   - var that = this;
101   - if (that.data.is_no_more == 0) return false;
102   - var curPage = that.data.curPage;
103   - getApp().request.get('/api/weshop/goods/page?page', {
104   - isShowLoading:false,
105   - data: {
106   - is_mainshow: 1,
107   - isonsale: 1,
108   - is_recommend: 1,
109   - is_on_sale: 1,
110   - store_id: o.stoid,
111   - page: curPage,
112   - pageSize: 6,
113   - orderField:"sort",
114   - orderType:'asc',
115   - },
116   - success: function(res) {
117   - var data = res.data;
118   - var total = data.data.total;
119   - if (total <= curPage * 6) {
120   - that.setData({
121   - is_no_more: 0
122   - });
123   - } else {
124   - that.data.curPage++;
125   - }
126   - //加载完成
127   - if (data.data.pageData) {
128   - that.setData({
129   - load_complete: 1
130   - });
131   - }
132   - if (that.data.recommend != null) {
133   - var ra = that.data.recommend.concat(data.data.pageData);
134   - that.setData({
135   - recommend: ra
136   - });
137   - } else {
138   - that.setData({
139   - recommend: data.data.pageData
140   - });
141   - }
142   - }
143   - })
  98 + get_list: function () {
  99 + var that = this;
  100 + if (that.data.is_no_more == 0) return false;
  101 + var curPage = that.data.curPage;
  102 + getApp().request.get('/api/weshop/goods/page?page', {
  103 + isShowLoading: false,
  104 + data: {
  105 + is_mainshow: 1,
  106 + isonsale: 1,
  107 + is_recommend: 1,
  108 + is_on_sale: 1,
  109 + store_id: o.stoid,
  110 + page: curPage,
  111 + pageSize: 6,
  112 + orderField: "sort",
  113 + orderType: 'asc',
  114 + },
  115 + success: function (res) {
  116 + var data = res.data;
  117 + var total = data.data.total;
  118 + if (total <= curPage * 6) {
  119 + that.setData({
  120 + is_no_more: 0
  121 + });
  122 + } else {
  123 + that.data.curPage++;
  124 + }
  125 + //加载完成
  126 + if (data.data.pageData) {
  127 + that.setData({
  128 + load_complete: 1
  129 + });
  130 + }
  131 + if (that.data.recommend != null) {
  132 + var ra = that.data.recommend.concat(data.data.pageData);
  133 + that.setData({
  134 + recommend: ra
  135 + });
  136 + } else {
  137 + that.setData({
  138 + recommend: data.data.pageData
  139 + });
  140 + }
  141 + }
  142 + })
144 143 },
145 144 bind_bnerr_xc: function (e) {
146 145 var _errImg = e.target.dataset.errorimg;
... ... @@ -156,41 +155,40 @@ Component({
156 155 getPlusCardType: function (func) {
157 156 var storid = o.stoid;
158 157 var th = this;
159   - getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid,
160   - {}).then(res => {
  158 + getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => {
161 159  
162   - if(res.data.code!=0 || !res.data.data){
163   - var ob = {
164   - "card_list": [],
165   - "name_map": ""
166   - };
167   - func(ob);
168   - return false;
169   - }
  160 + if (res.data.code != 0 || !res.data.data) {
  161 + var ob = {
  162 + "card_list": [],
  163 + "name_map": ""
  164 + };
  165 + func(ob);
  166 + return false;
  167 + }
170 168  
171   - var plusCard = res.data.data;
172   - var arr = [1219, 2089, 3031];
173   - var new_arr = new Array();
174   - var card_name_map = new Map();
175   -
176   - var user = getApp().globalData.userInfo;
177   - if(plusCard) {
178   - for (var i = 0; i < plusCard.length; i++) {
179   - if ((!user || user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) {
180   - continue;
181   - }
182   - var name = "card" + plusCard[i].CorrPrice.toLowerCase();
183   - card_name_map.set(name, plusCard[i].CardName);
184   - new_arr.push(plusCard[i]);
  169 + var plusCard = res.data.data;
  170 + var arr = [1219, 2089, 3031];
  171 + var new_arr = new Array();
  172 + var card_name_map = new Map();
185 173  
  174 + var user = getApp().globalData.userInfo;
  175 + if (plusCard) {
  176 + for (var i = 0; i < plusCard.length; i++) {
  177 + if ((!user || user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) {
  178 + continue;
186 179 }
  180 + var name = "card" + plusCard[i].CorrPrice.toLowerCase();
  181 + card_name_map.set(name, plusCard[i].CardName);
  182 + new_arr.push(plusCard[i]);
  183 +
187 184 }
188   - var ob = {
189   - "card_list": new_arr,
190   - "name_map": card_name_map
191   - };
192   - func(ob);
193   - })
  185 + }
  186 + var ob = {
  187 + "card_list": new_arr,
  188 + "name_map": card_name_map
  189 + };
  190 + func(ob);
  191 + })
194 192 },
195 193 },
196 194 })
197 195 \ No newline at end of file
... ...
components/my_confirm/my_confirm.wxml
  View file @46f28af
... ... @@ -3,12 +3,14 @@
3 3 <view class="xc-obscuration" bindtap='close_yu_e' catchtouchmove="ture"></view>
4 4 <view>
5 5 <view class="xc-qr-frame">
6   - <view class="shut" bindtap="close_yu_e">ⅹ</view>
7   - <view class="fs32 xc-black3 flex jc-center ai-center" style="padding: 10rpx 20rpx;min-height:220rpx;"><text>{{title}}</text></view>
8   - <view class="flex jc-center ai_center" style="width: 100%;height: 75rpx;">
9   - <view bindtap="go_sure" class="fs30 white flex jc-center ai-center ck_btn" style="margin-right: 20rpx;background:#ececea;">{{s_text}}</view>
10   - <view bindtap='go_cancle' class="fs30 xc-ash flex jc-center ai-center ck_btn color" >{{c_text}}</view>
11   - </view>
  6 + <view style="position: relative">
  7 + <view class="shut" bindtap="close_yu_e">ⅹ</view>
  8 + <view class="fs32 xc-black3 flex jc-center ai-center" style="padding: 10rpx 20rpx;min-height:220rpx;"><text>{{title}}</text></view>
  9 + <view class="flex jc-center ai_center" style="width: 100%;height: 75rpx;">
  10 + <view bindtap="go_sure" class="fs30 white flex jc-center ai-center ck_btn" style="margin-right: 20rpx;background:#ececea;">{{s_text}}</view>
  11 + <view bindtap='go_cancle' class="fs30 xc-ash flex jc-center ai-center ck_btn color" >{{c_text}}</view>
  12 + </view>
  13 + </view>
12 14 </view>
13 15 </view>
14 16 </view>
... ...
components/my_confirm/my_confirm.wxss
  View file @46f28af
... ... @@ -32,10 +32,10 @@
32 32 font-size: 40rpx;
33 33 color: #fff;
34 34 text-align: center;
35   - position: fixed;
  35 + position: absolute;
36 36 z-index: 66666;
37   - right: 75rpx;
38   - top: 465rpx;
  37 + right: -20rpx;
  38 + top: -20rpx;
39 39 background: #c8162c;
40 40 }
41 41 .xc-qr-frame{
... ...
packageA/pages/myGift/myGift.js
  View file @46f28af
... ... @@ -122,7 +122,17 @@ Page({
122 122 * 页面上拉触底事件的处理函数
123 123 */
124 124 onReachBottom: function () {
125   - this.scrollToLower('/api/weshop/libao/libaoFormvip/page', {
  125 +
  126 + var url="";
  127 + var index=this.data.currentIndex;
  128 + if(index == 0) {
  129 + url = '/api/weshop/libao/libaoForm/page';
  130 + } else if(index == 1) {
  131 + url = '/api/weshop/libao/libaoFormvip/page';
  132 + };
  133 +
  134 +
  135 + this.scrollToLower(url, {
126 136 store_id: app.globalData.setting.stoid,
127 137 user_id: app.globalData.user_id,
128 138 });
... ...
packageA/pages/myGift/myGift.wxml
  View file @46f28af
... ... @@ -33,7 +33,7 @@
33 33 </view>
34 34 <view class="fs22 c-a4 line-through mgl10">零售价{{filter.toFix(item.oldprice,2)}}</view>
35 35 </view>
36   - <view class="fs24 c-a4">已售{{item.salenum}}件</view>
  36 + <view class="fs24 c-a4">已售{{item.salenum+item.virtualsales}}件</view>
37 37 </view>
38 38 <!-- 时间 -->
39 39 <view class="date">活动结束日期 {{filter.format_time(item.endtime)}}</view>
... ...
packageA/pages/myGiftDetails/myGiftDetails.js
  View file @46f28af
... ... @@ -2,6 +2,7 @@
2 2 const app = getApp();
3 3 let self = null;
4 4 var os = app.globalData.setting;
  5 +var ut = require("../../../utils/util.js");
5 6  
6 7 Page({
7 8  
... ... @@ -72,6 +73,14 @@ Page({
72 73 if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
73 74 var da= res.data.data.pageData[0]
74 75 self.setData({ details:da, });
  76 +
  77 + //活动还未开始
  78 + if(da.startime>ut.gettimestamp()){
  79 + self.setData({ is_not_start:1, });
  80 + }
  81 +
  82 +
  83 +
75 84 console.log(da);
76 85 //礼包有俩种类型
77 86 if(da.lbtype==1){
... ...
packageA/pages/myGiftDetails/myGiftDetails.wxml
  View file @46f28af
... ... @@ -5,7 +5,8 @@
5 5  
6 6 <!-- 未买 -->
7 7 <block wx:if="{{index==0}}">
8   - <view class="fs26 exp_title">活动结束时间：{{filter.format_time(details.endtime,1)}}</view>
  8 + <view wx:if="{{is_not_start}}" class="fs26 exp_title">活动开始时间：{{filter.format_time(details.startime,1)}}</view>
  9 + <view wx:else class="fs26 exp_title">活动结束时间：{{filter.format_time(details.endtime,1)}}</view>
9 10 </block>
10 11 <!-- 已买 -->
11 12 <block wx:else>
... ... @@ -37,7 +38,7 @@
37 38 </view>
38 39 <view class="fs22 c-a4 line-through mgl10">零售价{{filter.toFix(details.oldprice,2)}}</view>
39 40 </view>
40   - <view class="fs24 c-a4">已售{{details.salenum}}件</view>
  41 + <view class="fs24 c-a4" wx:if="{{!is_not_start}}">已售{{details.salenum+details.virtualsales}}件</view>
41 42 </view>
42 43 <!-- 时间 -->
43 44 <!-- <view class="date">活动结束日期 {{filter.format_time(details.endtime)}}</view> -->
... ... @@ -86,7 +87,8 @@
86 87 <view class="lb_quan" style="background-image: url({{imghost}}/miniapp/images/yhq_{{index%2+1}}.png)">
87 88 <view class="flex fs28 fir_view">
88 89 <view>满{{item.condition}}使用</view>
89   - <view class="fs8" style="text-align: right">￥{{item.money}}</view>
  90 + <view wx:if="{{item.type==6}}" class="fs8" style="text-align: center; padding-right: 40rpx; font-size: 35rpx">包邮</view>
  91 + <view wx:else class="fs8" style="text-align: right">￥{{item.money}}</view>
90 92 </view>
91 93  
92 94  
... ... @@ -122,8 +124,13 @@
122 124 <!-- 按钮 -->
123 125 <view class="btn-container" wx:if="{{details.lbtype==1}}">
124 126 <block wx:if="{{index == 0}}">
125   - <view wx:if="{{details.lbintegral>0}}" bindtap="GetBuyIntegral" class="btn red">立即兑换</view>
126   - <view wx:if="{{details.lbprice>0}}" bindtap="GetBuyPrice" class="btn pink">立即购买</view>
  127 + <block wx:if="{{is_not_start}}">
  128 + <view class="btn gray">活动还未开始</view>
  129 + </block>
  130 + <block wx:else>
  131 + <view wx:if="{{details.lbintegral>0}}" bindtap="GetBuyIntegral" class="btn red">立即兑换</view>
  132 + <view wx:if="{{details.lbprice>0}}" bindtap="GetBuyPrice" class="btn pink">立即购买</view>
  133 + </block>
127 134 </block>
128 135  
129 136 <block wx:else>
... ... @@ -136,8 +143,14 @@
136 143  
137 144 <view class="btn-container" wx:if="{{details.lbtype==2}}">
138 145 <block wx:if="{{index == 0}}">
139   - <view wx:if="{{details.lbintegral>0}}" bindtap="GetBuyIntegral" class="btn red">立即兑换</view>
140   - <view wx:if="{{details.lbprice>0}}" bindtap="GetBuyPrice" class="btn pink">立即购买</view>
  146 + <block wx:if="{{is_not_start}}">
  147 + <view class="btn gray">活动还未开始</view>
  148 + </block>
  149 + <block wx:else>
  150 + <view wx:if="{{details.lbintegral>0}}" bindtap="GetBuyIntegral" class="btn red">立即兑换</view>
  151 + <view wx:if="{{details.lbprice>0}}" bindtap="GetBuyPrice" class="btn pink">立即购买</view>
  152 + </block>
  153 +
141 154 </block>
142 155 <block wx:else>
143 156 <view wx:if="{{details.isget}}" data-type="1" class="btn" style="background-color:#aaa;color: #fff">已领取</view>
... ...
packageA/pages/myGiftDetails/myGiftDetails.wxss
  View file @46f28af
... ... @@ -78,6 +78,13 @@ page {
78 78 color: #FF6768;
79 79 }
80 80  
  81 +.btn.gray{
  82 + background-color: #cccccc;
  83 + color:#fff
  84 +}
  85 +
  86 +
  87 +
81 88 .ling_btn{ background: #c0283a; color: #fff; width: 100rpx; height: 50rpx;
82 89 display: inline-block; line-height: 50rpx; border-radius: 10rpx}
83 90  
... ...
pages/cart/cart/cart.js
  View file @46f28af
... ... @@ -531,7 +531,7 @@ Page({
531 531 u_item.zh_prom_goods={};
532 532 for (let var1 in obj) {
533 533 var h_item=obj[var1];
534   - var gdlist= th.data.zuhe_map_good[item.prom_id];
  534 + var gdlist= th.data.zuhe_map_good[h_item.prom_id];
535 535 //获取活动需要的商品列表
536 536 u_item.zh_prom_goods[h_item.prom_id]=gdlist;
537 537 }
... ...
pages/cart/cart/cart.wxss
  View file @46f28af
... ... @@ -157,7 +157,7 @@ radio {
157 157 font-size: 28rpx;
158 158 color: #666;
159 159 background-color: rgb(255, 255, 255);
160   - z-index: 2;
  160 + z-index: 1999;
161 161 border-top: 1rpx solid rgb(236, 236, 236);
162 162 border-bottom: 1rpx solid rgb(236, 236, 236);
163 163  
... ...
pages/cart/cart2/cart2.js
  View file @46f28af
... ... @@ -2240,7 +2240,6 @@ Page({
2240 2240 if (th.data.is_all_zt == 1) addr = null;
2241 2241 var val_arr = t.detail.value;
2242 2242  
2243   -
2244 2243 if (th.data.is_all_zt != 1)
2245 2244 if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) {
2246 2245 th.data.is_summit_ing = 0;
... ... @@ -2426,7 +2425,7 @@ Page({
2426 2425 }
2427 2426  
2428 2427 //把优惠的平摊结果写进去
2429   - if (g_item.account >= 0 || g_item.account_yu != 0) {
  2428 + if (g_item.account >= 0 || (g_item.account_yu != 0 && g_item.account!=undefined)) {
2430 2429 if (g_item.account >= 0) goods.account = g_item.account;
2431 2430 if (g_item.account_yu != 0) goods.account_yu = g_item.account_yu;
2432 2431 item.is_discount_amount = 1;
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  View file @46f28af
... ... @@ -1481,13 +1481,13 @@
1481 1481 <view class="poster-wrapper">
1482 1482 <view class="poster">
1483 1483 <!-- <view class="poster" bindtap="previewImage"> -->
1484   - <image src="{{shareImgPath}}" class="poster-img" show-menu-by-longpress></image>
  1484 + <image src="{{shareImgPath}}" class="poster-img" ></image>
1485 1485 <view class="btn-close" catchtap="closePoster"><text class="iconfont icon-close"></text></view>
1486 1486 </view>
1487   - <!-- <view class="btn-container">
1488   - <button class="btn-share" open-type="share" bindtap="">微信好友分享</button>
1489   - <button class="btn-share" bindtap="savePic">保存到相册</button>
1490   - </view> -->
  1487 + <view class="btn-container">
  1488 + <!--<button class="btn-share" open-type="share" bindtap="">微信好友分享</button>-->
  1489 + <button class="btn-share" bindtap="savePic">保存到相册</button>
  1490 + </view>
1491 1491 </view>
1492 1492 </view>
1493 1493 </view>
... ...
pages/goods/goodsInfo/goodsInfo.wxss
  View file @46f28af
... ... @@ -2731,7 +2731,7 @@ button.custom-service::after{
2731 2731 top: 50%;
2732 2732 left: 50%;
2733 2733 transform: translate(-50%, -50%);
2734   - width: calc(100% - 120rpx);
  2734 + width: calc(100% - 220rpx);
2735 2735 z-index: 1000;
2736 2736 }
2737 2737 .mask {
... ... @@ -2741,7 +2741,7 @@ button.custom-service::after{
2741 2741 width: 100%;
2742 2742 height: 100%;
2743 2743 z-index: 999;
2744   - background-color: rgba(0,0,0,.4);
  2744 + background-color: rgba(0,0,0,.6);
2745 2745 }
2746 2746 .poster-wrapper {
2747 2747 width: 100%;
... ... @@ -2750,7 +2750,7 @@ button.custom-service::after{
2750 2750 .poster {
2751 2751 box-sizing: border-box;
2752 2752 width: 100%;
2753   - height: 1055rpx;
  2753 + height: 915rpx;
2754 2754 border-radius: 20rpx;
2755 2755 /* box-shadow: 0 8px 12px #666; */
2756 2756 position: relative;
... ...