diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js
index 03f88c1..004cc57 100644
--- a/packageB/pages/zuhegou/index/index.js
+++ b/packageB/pages/zuhegou/index/index.js
@@ -1040,7 +1040,7 @@ Page({
}
} else {
dd = {
- store_id: o.stoid,
+ store_id: os.stoid,
isstop: 0,
pageSize: 2000
}
@@ -1615,21 +1615,21 @@ Page({
//当满足组合的要求：总数要满足，起购数要满足
if (all_num >= this.data.act.zhbuyqty && !need_to_buy) {
function sortData(a, b) {
- return b.price - a.price
+ return a.price - b.price
}
+ if(no_in_arr.length) no_in_arr.sort(sortData);
- no_in_arr.sort(sortData);
var aprice = this.data.act.zhprice;
if (this.data.act.zhbuyqty > all_zhqty) {
- for (var n = 0; n < this.data.act.zhbuyqty; n++) {
+ for (var n = 0; n < this.data.act.zhbuyqty-all_zhqty; n++) {
no_in_arr.pop();
}
}
//看一下剩下的数量有没有满足组合购的要求，以及要不要倍增
- if (this.data.act.is_bz && no_in_arr.length > this.data.act.zhbuyqty) {
+ if (this.data.act.is_bz && no_in_arr.length >= this.data.act.zhbuyqty) {
//看一下是几倍
- var be = parseInt(no_in_arr / this.data.act.zhbuyqty);
+ var be = parseInt(no_in_arr.length / this.data.act.zhbuyqty);
aprice += be * aprice;
for (var m = 0; m < be * this.data.act.zhbuyqty; m++) {
no_in_arr.pop();
diff --git a/packageB/pages/zuhegou/index/index.wxss b/packageB/pages/zuhegou/index/index.wxss
index 0f67567..f9e3077 100644
--- a/packageB/pages/zuhegou/index/index.wxss
+++ b/packageB/pages/zuhegou/index/index.wxss
@@ -117,7 +117,7 @@ page {
.share-container {
position: fixed;
right: 20rpx;
- bottom: 200rpx;
+ bottom: 125rpx;
width: 100rpx;
height: 100rpx;
border-radius: 50%;
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 07e3e73..51f182b 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -304,7 +304,7 @@ Page({
await getApp().request.promiseGet(url, {}).then(res => {
if(res.data.code==0 && res.data.data){
if(res.data.data.is_show!=1){
- return false;
+ isok=0;
}
//如果活动已经结束
if(res.data.data.is_end==1){
@@ -1523,7 +1523,7 @@ Page({
//--------------去结算------------
async checkout() {
-
+ if(!this.data.total_num || this.data.total_num<=0) return false;
if(!this.data.is_load) return false;
if(this.data.up_dating) {
wx.showLoading({
@@ -1587,7 +1587,8 @@ Page({
glist += i_arr[j].goods_id + ",";
ab = 1;
//--普通商品，如果有开启线下库存的功能，要调用线下库存进行计算,赠品不要进行调用线下库存---
- if ((i_arr[j].prom_type == 0 || i_arr[j].prom_type == 3 || i_arr[j].prom_type == 5 || i_arr[j].need_downlow_num ) && th.data.sales_rules == 2 && i_arr[j].is_gift != 1) {
+ if ((i_arr[j].prom_type == 0 || i_arr[j].prom_type == 3 || i_arr[j].prom_type == 5
+ || i_arr[j].need_downlow_num ) && th.data.sales_rules == 2 && i_arr[j].is_gift != 1) {
//--获取商品的线下商品ID--
var gd = null;
await getApp().request.promiseGet("/api/weshop/goods/get/" + oo.stoid + "/" + i_arr[j].goods_id, {}).then(res => {
@@ -1749,7 +1750,8 @@ Page({
if (g_arr[i].goods_id == val.goods_id) {
//如果会员是等级会员,商品有等级价,且不是活动商品
- if (card_field && val[card_field] > 0 && (val.prom_type == 0 || val.prom_type == 3 || val.prom_type == 4 || val.prom_type == 5 || normal_arr[val.goods_id])) {
+ if (card_field && val[card_field] > 0 &&
+ (val.prom_type == 0 || val.prom_type == 3 || val.prom_type == 4 || val.prom_type == 5 || val.prom_type == 7 || normal_arr[val.goods_id])) {
if (g_arr[i].goods_price != val[card_field]) {
isok = 0;
gname = val.goods_name;
diff --git a/pages/cart/cart/zh_calculate.js b/pages/cart/cart/zh_calculate.js
index 5f5e35e..8c2c01c 100644
--- a/pages/cart/cart/zh_calculate.js
+++ b/pages/cart/cart/zh_calculate.js
@@ -146,26 +146,28 @@ module.exports = {
//当满足组合的要求：总数要满足，起购数要满足
if (all_num >= act.zhbuyqty && !need_to_buy) {
- function sortData(a, b) {
- return b.price - a.price
- }
+ function sortData(a, b) {
+ return a.price - b.price
+ }
+ if(no_in_arr.length>0) no_in_arr.sort(sortData);
- no_in_arr.sort(sortData);
var aprice = act.zhprice;
if (act.zhbuyqty > all_zhqty) {
- for (var n = 0; n < act.zhbuyqty; n++) {
+ for (var n = 0; n < act.zhbuyqty-all_zhqty; n++) {
no_in_arr.pop();
}
}
//看一下剩下的数量有没有满足组合购的要求，以及要不要倍增
- if (act.is_bz && no_in_arr.length > act.zhbuyqty) {
+ if (act.is_bz && no_in_arr.length >= act.zhbuyqty) {
//看一下是几倍
- var be = parseInt(no_in_arr / act.zhbuyqty);
+ var be = parseInt(no_in_arr.length / act.zhbuyqty);
aprice += be * act.zhprice;
for (var m = 0; m < be * act.zhbuyqty; m++) {
no_in_arr.pop();
}
}
+
+
//算一下剩余的钱
if (no_in_arr.length) {
for (var ii in no_in_arr) {
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 874de7d..2a28349 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -1469,7 +1469,7 @@ Page({
var order_prom_id = 0;
var o_condition = cart_item.order_amount;
//看一下是不是不用组合购的订单优惠的叠加
- if(o_price_no_zh>0){
+ if(is_has_zh){
o_condition=o_price_no_zh-quan_price;
}
diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index cc11c39..227ee14 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -429,7 +429,7 @@
- 优惠活动
+ 组合购优惠
- ￥ {{filters.toFix(formData.zh_cut_price,2)}}元
diff --git a/pages/cart/cart2/zh_calculate.js b/pages/cart/cart2/zh_calculate.js
index 6c983b6..5b6f061 100644
--- a/pages/cart/cart2/zh_calculate.js
+++ b/pages/cart/cart2/zh_calculate.js
@@ -24,14 +24,14 @@ module.exports = {
let no_in_arr = []; //剩余的未加入组合购
for (let j in act_goos) {
+ let item = act_goos[j];
let item_j = goods.find(function (ele) {
return ele.goods_id == act_goos[j].goods_id;
})
- if(!item_j) continue;
- act_goos[j].num = item_j.goods_num;
- act_goos[j].goods_price = item_j.goods_price;
- let item = act_goos[j];
- if (item.num) {
+ //-- 如果有找到的话 --
+ if (item_j) {
+ act_goos[j].num = item_j.goods_num;
+ act_goos[j].goods_price = item_j.goods_price;
all_num += item.num;
//当有起购数的控制的时候
if (item.zhqty) {
@@ -65,19 +65,21 @@ module.exports = {
//当满足组合的要求：总数要满足，起购数要满足
if (all_num >= act.zhbuyqty && !need_to_buy) {
function sortData(a, b) {
- return b.price - a.price
+ return a.price - b.price
}
- no_in_arr.sort(sortData);
+
+ if(no_in_arr.length>0) no_in_arr.sort(sortData);
+
aprice = act.zhprice;
if (act.zhbuyqty > all_zhqty) {
- for (let n = 0; n < act.zhbuyqty; n++) {
+ for (let n = 0; n < act.zhbuyqty-all_zhqty; n++) {
no_in_arr.pop();
}
}
//看一下剩下的数量有没有满足组合购的要求，以及要不要倍增
- if (act.is_bz && no_in_arr.length > act.zhbuyqty) {
+ if (act.is_bz && no_in_arr.length >= act.zhbuyqty) {
//看一下是几倍
- let be = parseInt(no_in_arr / act.zhbuyqty);
+ let be = parseInt(no_in_arr.length / act.zhbuyqty);
aprice += be * act.zhprice;
for (let m = 0; m < be * act.zhbuyqty; m++) {
no_in_arr.pop();
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 996dfb2..6afbe9d 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -1300,6 +1300,68 @@ Page({
th.add_cart_next(e,t,a,o,newd); //加入购物车下一步
+ }else if(o.prom_type==7){
+
+ //判断进行中的活动，是不是要判断线下库存
+ check_zh_acting(function (e) {
+ newd.prom_id = 0;
+ newd.prom_type = 0;
+ if(e){
+ newd.prom_id = th.data.zh_act.id;
+ newd.prom_type = 7;
+ if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
+ if (o.store_count 0){
+ var CanOutQty=res.data.data.pageData[0].CanOutQty;
+ if(CanOutQty0){
+
+ var lock=0;
+ for(var i in res_data.data.data.pageData){
+ lock+=res_data.data.data.pageData[i].outQty;
+ }
+
+ if(CanOutQty<=lock){
+ return s.my_warnning("库存不足！", 0, th);
+ }
+ th.add_cart_next(e,t,a,o,newd,CanOutQty-lock);
+ }else{
+ th.add_cart_next(e,t,a,o,newd,CanOutQty);
+ }
+ }
+ })
+ }else{
+ return s.my_warnning("库存不足！", 0, th);
+ }
+
+ }
+ }
+ })
+ }else{
+ if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
+ if (o.store_count {
+ if(res.data.code==0 && res.data.data){
+ if(res.data.data.is_show!=1){
+ isok=0;
+ }
+ //如果活动已经结束
+ if(res.data.data.is_end==1){
+ isok=0;
+ }
+ //已经结束
+ if(ut.gettimestamp()>res.data.data.end_time){
+ isok=0;
+ }
+ //还未开始
+ if(ut.gettimestamp()
- {{order_prom.name}}
+ {{zh_act.name}}
(活动时间：{{tool.format_tt(zh_act.start_time)}} - {{tool.format_tt(zh_act.end_time)}})
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index 2027e0b..ac33f34 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -9,7 +9,7 @@
- {{userInfo.nickname}}
+ {{userInfo.nickname}}
{{GradeName}}
diff --git a/pages/user/index/index.wxss b/pages/user/index/index.wxss
index 2f178e1..e9bda3d 100644
--- a/pages/user/index/index.wxss
+++ b/pages/user/index/index.wxss
@@ -692,7 +692,7 @@
background: #383838;
padding: 0 15rpx;
border-radius: 20rpx;
- vertical-align: middle;
+ vertical-align: top;
}
.vip-mem {
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 0bd5e59..1752ce8 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -835,15 +835,15 @@ Page({
//--如果是赠品，不加入购物车--
if(g_item['is_gift']) continue;
if(g_item['prom_type']==4 ){
- $err_text+= g_item['goods_name']+"积分购商品不加入购物车\n";
+ err_text+= g_item['goods_name']+"积分购商品不加入购物车\n";
continue;
}
if(g_item['prom_type']==5){
- $err_text+= g_item['goods_name']+"搭配购商品不加入购物车\n";
+ err_text+= g_item['goods_name']+"搭配购商品不加入购物车\n";
continue;
}
if(g_item['prom_type']==6 ){
- $err_text+= g_item['goods_name']+"拼团商品不加入购物车\n";
+ err_text+= g_item['goods_name']+"拼团商品不加入购物车\n";
continue;
}
@@ -919,6 +919,21 @@ Page({
break;
case 6:
b_item.is_pd_normal=1; break;
+ case 7:
+ //如果有组合购
+ var url="/api/weshop/prom/zhbuy/get/"+os.stoid+"/"+good.prom_id+"/"+getApp().globalData.userInfo.user_id;
+ await getApp().request.promiseGet(url, {}).then(res => {
+ if(res.data.code==0 && res.data.data){
+ if(res.data.data.is_show==1 && res.data.data.is_end==0
+ && ut.gettimestamp()res.data.data.start_time
+ ){
+ b_item.prom_type=7;
+ b_item.prom_id=res.data.data.id;
+ }
+ }
+ })
+ break;
}
//如果有优惠促销的时候,要看下商品的优惠活动有没有过期
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 2e35964..35b14a1 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -934,59 +934,59 @@ Page({
var goods_list=item.order_goods;
//--- 返回的内容 ---
var back_goods_arr=[];
- var err_text="";
+ var err_text="";
for(var i in goods_list){
var g_item=goods_list[i];
//--如果是赠品，不加入购物车--
- if(g_item['is_gift']) continue;
+ if(g_item['is_gift']) continue;
if(g_item['prom_type']==4 ){
- $err_text+= g_item['goods_name']+"积分购商品不加入购物车\n";
+ err_text+= g_item['goods_name']+"积分购商品不加入购物车\n";
continue;
}
if(g_item['prom_type']==5){
- $err_text+= g_item['goods_name']+"搭配购商品不加入购物车\n";
+ err_text+= g_item['goods_name']+"搭配购商品不加入购物车\n";
continue;
}
if(g_item['prom_type']==6 ){
- $err_text+= g_item['goods_name']+"拼团商品不加入购物车\n";
+ err_text+= g_item['goods_name']+"拼团商品不加入购物车\n";
continue;
- }
-
- //--获取商品--
- var good=null;
+ }
+
+ //--获取商品--
+ var good=null;
await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + g_item.goods_id, {
-
- }).then(res=>{
+
+ }).then(res=>{
good=res.data.data;
})
-
+
if(!good){
err_text+= g_item['goods_name']+"未找到商品\n";
continue;
- }
+ }
if (good.is_on_sale != 1) {
err_text+= g_item['goods_name']+"已经下架\n";
- continue;
+ continue;
}
-
- var timestamp = ut.gettimestamp();
+
+ var timestamp = ut.gettimestamp();
if (good.on_time > timestamp) {
err_text+= g_item['goods_name']+"还未上架\n";
- continue;
- }
+ continue;
+ }
if (good.down_time > 0) {
if (good.down_time < timestamp) {
err_text+=g_item['goods_name']+"已经下架\n";
continue;
}
}
-
+
//如果商品的配送方式和门店不匹配
if(good['distr_type']>0 && pickup['distr_type']>0 && good['distr_type']!=pickup['distr_type'] ){
err_text+= good['goods_name']+"配送方式不一致\n";
continue;
}
-
+
var prom=null;
var b_item={}
b_item.goods_id=g_item.goods_id;
@@ -997,38 +997,56 @@ Page({
b_item.pickup_id=item.pickup_id;
b_item.price=good.shop_price;
b_item.goods_sn=good.goods_sn;
- b_item.sku=good.sku;
+ b_item.sku=good.sku;
b_item.is_integral_normal=g_item.is_integral_normal;
-
+
//-- 如果会员是等级卡的时候,同时商品也有设置相应的卡价格 --
var card_field=th.data.card_field;
if(card_field && good[card_field]>0){
- b_item.price=good[card_field];
+ b_item.price=good[card_field];
}
-
+
//--判断商品当前的活动情况--
switch(good.prom_type){
//秒杀
- case 1:
+ case 1:
var flash=null;
- await getApp().request.promiseGet("/api/ms/flash_sale/get/" + os.stoid + "/" + good.prom_id, {
+ await getApp().request.promiseGet("/api/ms/flash_sale/get/" + os.stoid + "/" + good.prom_id, {
}).then(res=>{
if (res.data.code== 0) {
flash=res.data.data;
}
- })
- //----已经结束-----
+ })
+ //----活动还没有结束-----
if (flash && flash.is_end == 0 && flash.end_time>timestamp && flash.start_time {
+ if(res.data.code==0 && res.data.data){
+ if(res.data.data.is_show==1 && res.data.data.is_end==0
+ && ut.gettimestamp()res.data.data.start_time
+ ){
+ b_item.prom_type=7;
+ b_item.prom_id=res.data.data.id;
+ }
+ }
+ })
+ break;
}
-
+
+
//如果有优惠促销的时候,要看下商品的优惠活动有没有过期
if(g_item.prom_type==3 || good.prom_type==3){
await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/1", {}).then(res => {
@@ -1038,15 +1056,15 @@ Page({
b_item.prom_type=3;
b_item.prom_id=r_data.promGoodsLists[0].prom_id;
}
- }
- })
+ }
+ })
}
-
- //判断是不是线下库存的购买， 是不是秒杀活动
- if(th.data.sales_rules==2 && !prom){
+
+ //判断是不是线下库存的购买， 是不是秒杀活动
+ if(th.data.sales_rules==2 && !prom){
//-- 看一下购物车上有多少商品 --
- var cart_num=0;
- await getApp().request.promiseGet("/api/weshop/cart/page", {
+ var cart_num=0;
+ await getApp().request.promiseGet("/api/weshop/cart/page", {
data: {
store_id: os.stoid,
user_id: getApp().globalData.user_id,
@@ -1061,9 +1079,9 @@ Page({
num += res.data.data.pageData[i].goods_num;
}
}
- cart_num=num;
+ cart_num=num;
})
-
+
var lock=0,plist=null;
//先读取门店的lock,
await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
@@ -1072,26 +1090,26 @@ Page({
if(res.data.code==0 && res.data.data.total>0){
for(var i in res.data.data.pageData)
lock+=res.data.data.pageData[i].outQty
- }
+ }
})
-
+
//---通过接口获取门店的线下库存信息--
await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
data:{storageNos:pickup.pickup_no,wareIds:encodeURIComponent(good.erpwareid),storeId:os.stoid}
}).then(res=>{
if(res.data.code==0 && res.data.data.total>0){
plist=res.data.data.pageData[0];
- }
+ }
})
-
+
if(!plist){
err_text+= good['goods_name']+"库存不足\n";
- continue;
- }
+ continue;
+ }
if(plist.CanOutQty-lock<=0){
err_text+= good['goods_name']+"库存不足\n";
- continue;
- }
+ continue;
+ }
if(b_item.goods_num>(plist.CanOutQty-lock)){
b_item.goods_num=plist.CanOutQty-lock;
}
@@ -1100,42 +1118,42 @@ Page({
user_id: getApp().globalData.user_id,
goods_id: good.goods_id,
};
-
- var buynum=0;
+
+ var buynum=0;
//---要获得商品，该用户买了多少件,同步应用---
await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
data: req_data,
- }).then(res => {
+ }).then(res => {
if(res.data.code==0){
var buy_num_data = res.data.data;
buynum = buy_num_data.goodsbuynum;
- }
+ }
})
-
+
//---- 要计算商品的限购 -----
- if(good['viplimited']>0){
+ if(good['viplimited']>0){
if(cart_num+buynum>good['viplimited']){
err_text+= good['goods_name']+"超出限购\n";
continue;
- }
+ }
good['viplimited']-=(cart_num+buynum);
if(b_item.goods_num>good['viplimited']){
b_item.goods_num=good['viplimited'];
- }
+ }
}
-
- back_goods_arr.push(b_item); //返回商品元素
-
+
+ back_goods_arr.push(b_item); //返回商品元素
+
}else{
-
+
//-- 看一下购物车上有多少商品 --
- var cart_num=0;
- await getApp().request.promiseGet("/api/weshop/cart/page", {
+ var cart_num=0;
+ await getApp().request.promiseGet("/api/weshop/cart/page", {
data: {
store_id: os.stoid,
user_id: getApp().globalData.user_id,
state:0, is_gift:0,
- goods_id:good.goods_id
+ goods_id:good.goods_id
}
}).then(res=>{
var num = 0;
@@ -1144,95 +1162,95 @@ Page({
num += res.data.data.pageData[i].goods_num;
}
}
- cart_num=num;
+ cart_num=num;
})
-
-
+
+
if(good.store_count<=0){
err_text+= good['goods_name']+"库存不足\n";
- continue;
+ continue;
}
if(b_item.goods_num>good.store_count)
b_item.goods_num=good.store_count;
-
+
var buynum=0; //商品已经购买多少件
- var promgoodsbuynum=0; //活动已经购买多少件
+ var promgoodsbuynum=0; //活动已经购买多少件
var redis_num = 0; //redis库存
-
+
var req_data={
store_id: os.stoid,
user_id: getApp().globalData.user_id,
goods_id: good.goods_id,
};
-
+
if(prom){
req_data.prom_type= good.prom_type;
req_data.prom_id= good.prom_id;
- b_item.prom_type=good.prom_type;
- b_item.prom_id=good.prom_id;
+ b_item.prom_type=good.prom_type;
+ b_item.prom_id=good.prom_id;
//------判断活动是否抢光-----
await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
os.stoid + "/" + good.prom_type + "/" + good.prom_id, {
1: 1
}).then(res => {
redis_num = res.data.data;
- });
+ });
if(redis_num<=0){
err_text+= good['goods_name']+"活动不足\n";
- continue;
- }
-
+ continue;
+ }
+
}
-
+
//---要获得商品，该用户买了多少件,同步应用---
await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
data: req_data,
- }).then(res => {
+ }).then(res => {
if(res.data.code==0){
var buy_num_data = res.data.data;
if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum;
buynum = buy_num_data.goodsbuynum;
- }
- })
-
- //---- 要计算商品的限购 -----
- if(good['viplimited']>0){
+ }
+ })
+
+ //---- 要计算商品的限购 -----
+ if(good['viplimited']>0){
if(cart_num+buynum>good['viplimited']){
err_text+= good['goods_name']+"超出限购\n";
continue;
- }
+ }
good['viplimited']-=(cart_num+buynum);
if(b_item.goods_num>good['viplimited']){
b_item.goods_num=good['viplimited'];
}
-
+
}
-
+
//-- 判断活动的库存 --
- if(prom){
+ if(prom){
if(prom['goods_num']<=prom['buy_num']){
err_text+= good['goods_name']+"超出活动库存\n";continue;
- }
-
+ }
+
if(b_item.goods_num>prom['goods_num']-prom['buy_num']){
b_item['goods_num']= b_item['goods_num']-b_item['buy_num'];
}
-
+
if(b_item.goods_num>redis_num){
b_item.goods_num=redis_num;
- }
-
+ }
+
if(cart_num+buynum>prom['buy_limit']){
err_text+= good['goods_name']+"超出活动限购\n";continue;
}
prom['buy_limit'] -= (cart_num+buynum);
if(b_item.goods_num>prom['buy_limit']){
- b_item.goods_num=prom['buy_limit'];
+ b_item.goods_num=prom['buy_limit'];
}
-
+
}
- back_goods_arr.push(b_item); //返回商品元素
- }
+ back_goods_arr.push(b_item); //返回商品元素
+ }
}
//有重新购买的数据是时候，就要重新生成订单
diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml
index 6e0aabd..456c8dd 100644
--- a/pages/user/userinfo/userinfo.wxml
+++ b/pages/user/userinfo/userinfo.wxml
@@ -10,12 +10,12 @@
-
- {{user.nickname}}
+
+ {{user.nickname}}
-
+
diff --git a/pages/user/userinfo/userinfo.wxss b/pages/user/userinfo/userinfo.wxss
index 7441863..dbe1b38 100644
--- a/pages/user/userinfo/userinfo.wxss
+++ b/pages/user/userinfo/userinfo.wxss
@@ -48,7 +48,7 @@ input {
}
.Nickname {
- max-width: 170rpx;
+ max-width: 375rpx;
}
.Ancrown {