diff --git a/app.json b/app.json
index d96d9ae..e017ce1 100644
--- a/app.json
+++ b/app.json
@@ -3,7 +3,6 @@
"pages/index/index/index",
"pages/goods/categoryList/categoryList",
"pages/cart/cart/cart",
- "pages/cart/cart4/cart4",
"pages/goods/goodsInfo/goodsInfo",
"pages/goods/goodsList/goodsList",
"pages/user/index/index",
@@ -237,7 +236,9 @@
"pages/order/refund_order/refund_order",
"pages/payment/payment/payment",
"pages/user/my_service/tment_details",
- "pages/user/my_service/tment_eval"
+ "pages/user/my_service/tment_eval",
+ "pages/user_template/index",
+ "pages/team/team_show/team_show"
]
}
],
diff --git a/components/add_purchase/add_purchase.js b/components/add_purchase/add_purchase.js
index 88c941b..66b440f 100644
--- a/components/add_purchase/add_purchase.js
+++ b/components/add_purchase/add_purchase.js
@@ -18,7 +18,7 @@ Component({
properties: {
},
-
+
lifetimes: {
// attached: function () {
// // this.clearTime()
@@ -289,7 +289,7 @@ Component({
that.setData({
listServiceItem: t.data.data.listServiceItem,
});
- };
+ };
that.setData({
'sele_g.goods_name': t.data.data.serviceName,
'sele_g.shop_price': t.data.data.money,
@@ -1276,7 +1276,7 @@ Component({
let sele_g_new = t.data.data
let sele_g = th.data.sele_g
if (sele_g_new && sele_g_new.original_img && !sele_g.original_img) {
- sele_g.original_img=sele_g_new.original_img
+ sele_g.original_img = sele_g_new.original_img
}
th.setData({
sele_g
@@ -1458,7 +1458,7 @@ Component({
if (!th.data.sele_g) return false;
var g_distr_type = th.data.sele_g.distr_type;
- if ( g_distr_type && g_distr_type != 0) {
+ if (g_distr_type && g_distr_type != 0) {
dd = {
store_id: o.stoid,
distr_type: g_distr_type,
@@ -1490,7 +1490,7 @@ Component({
}
wx.showLoading({
title: '加载中.',
- mask:true
+ mask: true
});
//----------获取门店----------------
getApp().request.promiseGet("/api/weshop/pickup/list", {
@@ -3739,7 +3739,7 @@ Component({
sele_spec: function (e) {
//如果只有一个规格直接结束
- if ((this.data.sku_g && this.data.sku_g.length==1) || (this.data.sku_g_pt && this.data.sku_g_pt.length==1)) {
+ if ((this.data.sku_g && this.data.sku_g.length == 1) || (this.data.sku_g_pt && this.data.sku_g_pt.length == 1)) {
return
}
if (this.data.sp_seleing) {
@@ -5239,7 +5239,7 @@ Component({
ob[txt] = this.data.iurl + "/miniapp/images/default_g_img.gif";
this.setData(ob);
},
- async getUserBuyPromNum(prom_id,is_zh) {
+ async getUserBuyPromNum(prom_id, is_zh) {
var userInfo = getApp().globalData.userInfo;
var url = `/api/weshop/ordergoods/getUserBuyPromNum?store_id=${os.stoid}&user_id=${userInfo.user_id}&prom_type=7&prom_id=${prom_id}`;
let res = await getApp().request.promiseGet(url, {
@@ -5252,10 +5252,19 @@ Component({
this.setData({
userbuynum
})
- if(is_zh) this.data.user_zh_buy_num=userbuynum;
+ if (is_zh) this.data.user_zh_buy_num = userbuynum;
// return userbuynum
},
-
+ //-- 根据ID拿出门店 --
+ get_pick_from_list(pid) {
+ var all_pick_list = this.data.all_pick_list;
+ for (var i in all_pick_list) {
+ var item = all_pick_list[i];
+ if (item.pickup_id == pid) {
+ return item;
+ }
+ }
+ },
}
})
diff --git a/components/com_top_nav/com_top_nav.js b/components/com_top_nav/com_top_nav.js
index a111153..10f442e 100644
--- a/components/com_top_nav/com_top_nav.js
+++ b/components/com_top_nav/com_top_nav.js
@@ -23,7 +23,7 @@ Component({
},
ready: function() {
let height= getApp().globalData.navBarHeight;
- let menuInfo = getApp().globalData.menuInfo;
+ let menuInfo = getApp().globalData.menuInfo || {height:0};
let user_no='';
if(getApp().globalData.userInfo){
user_no=getApp().globalData.userInfo.erpvipno
diff --git a/components/diy_user_info/diy_user_info.js b/components/diy_user_info/diy_user_info.js
new file mode 100644
index 0000000..8fc5326
--- /dev/null
+++ b/components/diy_user_info/diy_user_info.js
@@ -0,0 +1,198 @@
+const rq = require("../../utils/request.js");
+const ut = require("../../utils/util.js");
+const {barcode,qrcode} = require("../../utils/index.js");
+var s = getApp().globalData.setting;
+var r=s;
+Component({
+ properties: {
+ object: {
+ type: Object,
+ value: null
+ },
+ qy_data:{
+ type: Object,
+ value: null
+ },
+ pulscardname:{
+ type:String,
+ value:"--"
+ },
+ rfmName:{
+ type:String,
+ value:"--"
+ },
+ yuer:{
+ type:Number,
+ value:0
+ },
+ byquan:{
+ type:Number,
+ value:0
+ },
+ udata:{
+ type: Object,
+ value: null
+ },
+
+ },
+ data: {
+ // 这里是一些组件内部数据
+ iurl: s.imghost,
+ defaultAvatar: s.imghost + "/miniapp/images/no-head.jpg",
+ userInfo:null,
+
+ sys_switch:null,
+ tc_hide:true, //会员卡的弹出层隐藏
+ brcode:'',
+ showvipcode:false,
+
+ },
+
+ ready: function() {
+ var th=this;
+ if(getApp().globalData.userInfo){
+ this.setData({userInfo:getApp().globalData.userInfo});
+ }
+ /*-------系统是否开通等级卡,会员是等级卡-----*/
+ getApp().getConfig2(function (e) {
+ var t_swi = e.switch_list;
+ if (t_swi) t_swi = JSON.parse(t_swi)
+ if (t_swi) {
+ th.setData({sys_switch: t_swi});
+ }
+ var getuserqy_color=e.userqy_color;
+ if (getuserqy_color) getuserqy_color = JSON.parse(getuserqy_color)
+ if(getuserqy_color){
+ th.setData({userqy_color:getuserqy_color})
+ }
+ })
+
+ },
+
+ pageLifetimes: {
+ //要处理一下,游客登录后的界面的变化,主要还该是改变会员
+ show: function () {
+ if(!this.data.userInfo && getApp().globalData.userInfo){
+ this.setData({userInfo:getApp().globalData.userInfo});
+ }
+ }
+ },
+
+ methods: {
+ //登陆会员
+ login_user(){
+ getApp().goto('/packageE/pages/togoin/togoin');
+ },
+ //------卡片的显示和关闭--------
+ show_tc: function () {
+ var that=this;
+ if (!this.data.userInfo) return false;
+ var getnowtime;
+ getApp().request.get("/api/weshop/users/getServerTime", {
+ success: function (res) {
+ if (res.data.code == 0)
+ {
+ getnowtime=res.data.data;
+ if (!getnowtime)
+ {
+ ut.m_toast("获取服务时间失败");
+ return;
+ }
+ //base64_encode($user.mobile.'|'.date('Y-m-d H:i:s')
+ var val = that.data.userInfo.mobile + "|" +getnowtime+"|"+that.data.getusercode_vailtime;
+ val = "^" + ut.base64_encode(val);
+
+ qrcode('qrcode', val, 350, 350, that);
+ let userInfo = getApp().globalData.userInfo;
+ barcode('barcode', userInfo.userQrcode, 480,140,that);
+ that.setData({
+ tc_hide: false,
+ brcode:userInfo.userQrcode
+ });
+ }
+ }
+ })
+ },
+ showtext:function(){
+ this.setData({
+ showvipcode:true
+ })
+ },
+ //隐藏会员卡
+ hide_tc: function () {
+ this.setData({
+ tc_hide: true,
+ });
+ },
+
+ //--跳转到预存款页面--
+ deposit: function () {
+ if (!this.data.userInfo)
+ {
+ this.login_user();
+ return false;
+ }
+ wx.navigateTo({
+ url: '/packageD/pages/user/deposit/deposit',
+ })
+ },
+ //--跳转到余额页面--
+ balance: function () {
+ if (!this.data.userInfo)
+ {
+ this.login_user();
+ return false;
+ };
+ wx.navigateTo({
+ url: '/packageD/pages/user/member/menber',
+ })
+ },
+ //--跳转到优惠券--
+ coupon: function () {
+ var th = this;
+ if (!this.data.userInfo)
+ {
+ this.login_user();
+ return false;
+ };
+ // th.sendsm();
+ wx.navigateTo({
+ url: '/packageD/pages/user/coupons/coupons',
+ })
+ },
+ //--跳转到积分--
+ integral: function () {
+ if (!this.data.userInfo)
+ {
+ this.login_user();
+ return false;
+ }
+ wx.navigateTo({
+ url: '/packageD/pages/user/integral/integral',
+ })
+ },
+
+ jump: function () {
+ let isRfm = wx.getStorageSync('isRfm')
+ //升级为RFM就不跳转成长值详情
+ if (!isRfm) {
+ getApp().goto("/packageE/pages/user/grow_value/grow_value")
+ }
+ },
+
+ //跳转到链接
+ goto: function (e) {
+ console.log(e);
+ console.log('跳转');
+ var url = e.currentTarget.dataset.url;
+ wx.navigateTo({ url: url })
+
+ },
+
+ go_info:function (){
+ getApp().goto("/packageG/pages/user/userinfo/userinfo");
+ }
+
+
+ }
+})
\ No newline at end of file
diff --git a/components/diy_user_info/diy_user_info.json b/components/diy_user_info/diy_user_info.json
new file mode 100644
index 0000000..9e7089c
--- /dev/null
+++ b/components/diy_user_info/diy_user_info.json
@@ -0,0 +1,3 @@
+{
+ "component": true
+ }
\ No newline at end of file
diff --git a/components/diy_user_info/diy_user_info.wxml b/components/diy_user_info/diy_user_info.wxml
new file mode 100644
index 0000000..f184aa0
--- /dev/null
+++ b/components/diy_user_info/diy_user_info.wxml
@@ -0,0 +1,91 @@
+
+
+
+
+
+ s
+
+
+ s
+
+
+ s
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 加入plus会员预计可省3031元
+
+
+ 立即开通
+
+
+
+
+
+
+
+
+ 加入plus会员预计可省3031元
+
+
+ 立即续费
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{userInfo.nickname}}
+
+
+
+ {{userInfo.address}}
+
+
+
+
+
+
+
+
+
+
+ {{brcode}}
+
+
+ 点击可查看条形数据
+
+
+
+
\ No newline at end of file
diff --git a/components/diy_user_info/diy_user_info.wxss b/components/diy_user_info/diy_user_info.wxss
new file mode 100644
index 0000000..d12f368
--- /dev/null
+++ b/components/diy_user_info/diy_user_info.wxss
@@ -0,0 +1,242 @@
+@import '../../app.wxss';
+.addplus {
+ width: 100%;
+}
+.xc-add-member-farem {
+ width: 100%;
+ height: 84rpx;
+}
+.xc-add-member {
+ background-size: 100%;
+ margin-top: 10rpx;
+ color: rgb(238, 205, 172);
+ width: 730rpx;
+ height: 90rpx;
+ border-radius: 15rpx 15rpx 0 0;
+ background: url("data:image/jpeg;base64,/9j/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/sABFEdWNreQABAAQAAABkAAD/4QN6aHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjUtYzAxNCA3OS4xNTE0ODEsIDIwMTMvMDMvMTMtMTI6MDk6MTUgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6MDhlYTAxZTktZGVjMy00MTc1LWE4MzEtNWQ0NjFhNWIzOGRjIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjdEMDAzN0JDRjNBQTExRTk4QjYzRjhEM0E3NkM1REQ0IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjdEMDAzN0JCRjNBQTExRTk4QjYzRjhEM0E3NkM1REQ0IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDQyAoV2luZG93cykiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo4NGY5ODE2MS1mMjVjLWIzNDItOGYxNi1lMTNkY2Q2ZDJiMDgiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MDhlYTAxZTktZGVjMy00MTc1LWE4MzEtNWQ0NjFhNWIzOGRjIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3Jk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") no-repeat center;
+}
+.xc-add-member .xc-icon {
+ width: 30rpx;
+ height: 30rpx;
+}
+.xc-add-member .member {
+ margin-left: 10rpx;
+}
+
+.xc-opening {
+ border-radius: 20rpx;
+ background: rgb(238, 205, 172);
+ height: 34rpx;
+ line-height: 34rpx;
+ color: #000;
+ padding-left: 15rpx;
+ padding-right: 17rpx;
+ padding: 5rpx 18rpx 5rpx 15rpx;
+}
+
+
+/*-- 头部 --*/
+.xc-user .xc-head {
+ height: 380rpx;
+}
+
+.xc-background {
+ width:100%;
+ height: 100%;
+}
+
+.xc-user-frame {
+ width: 83%;
+ height: 35%;
+ top: 44rpx;
+ left: 56rpx;
+}
+.xc-user-left {
+ height: 110rpx;
+ margin-top: 10rpx;
+ margin-left: 5rpx;
+}
+.xc-user-img {
+ width: 110rpx;
+ height: 110rpx;
+}
+
+/*等级卡有关*/
+.plusMax {
+ background: linear-gradient(to bottom, #4c3217, #010100);
+ height: 40rpx;
+ border-radius: 20rpx;
+ line-height: 40rpx;
+ padding-left: 15rpx;
+ padding-right: 15rpx;
+ font-size: 20rpx;
+ position: absolute;
+ left: 50%;
+ bottom: -20rpx;
+ white-space: nowrap;
+ transform: translate(-50%, 0);
+ color: #fff;
+}
+.fuls {
+ width: 25rpx;
+ height: 25rpx;
+ margin-right: 5rpx;
+}
+.xc-uesr-name {
+ color: #fff;
+ font-size: 32rpx;
+ margin-top: 17rpx;
+ margin-left: 20rpx;
+}
+.hvip {
+ display: inline-block;
+ font-size: 20rpx;
+ height: 40rpx;
+ line-height: 40rpx;
+ color: #e7bf77;
+ background: #383838;
+ padding: 0 15rpx;
+ border-radius: 20rpx;
+ margin-left: 5rpx;
+}
+.vip-mem {
+ width: 26rpx;
+ height: 23rpx;
+ vertical-align: top;
+ margin-top: 8rpx;
+ margin-right: 5rpx;
+}
+.grow-up-val {
+ /* padding:1rpx 13rpx 1rpx 13rpx; */
+ border-radius: 20rpx;
+ background: #ffbdce;
+ padding-left: 16rpx;
+ padding-right: 16rpx;
+ padding-bottom: 3rpx;
+ margin-right: 5rpx;
+}
+.xc-assets {
+ width: 94%;
+ bottom: 26rpx;
+ color: #fff;
+ line-height: 46rpx;
+ margin-left: 10rpx;
+}
+
+
+.xc-qrcode-frame {
+ /* border-radius: 10rpx;
+ border: 5rpx solid #fe9db5;
+ background: #fe9db5;
+ width: 70rpx;
+ height: 70rpx; */
+ top: 40rpx;
+ right: 40rpx;
+}
+
+.xc-qrcode {
+ border-radius: 10rpx;
+ border: 5rpx solid #fe9db5;
+ background: #fe9db5;
+ width: 70rpx;
+ height: 70rpx;
+}
+
+/*---弹出层---*/
+.modal-box {
+ position: fixed;
+ width: 100%;
+ height: 100%;
+ top: 0px;
+ background: rgba(0, 0, 0, 0.4);
+ overflow: hidden;
+}
+
+.modal-body {
+ position: fixed;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ margin: auto;
+ z-index: 100;
+ background: #fff;
+ /* margin-left: 73rpx; */
+ width: 600rpx;
+ height: 860rpx;
+ border-radius: 8px;
+ text-align: center;
+}
+
+.modal-content {
+ width: 480rpx;
+ margin: 0 auto;
+ margin-top: 60rpx;
+ overflow: hidden;
+}
+
+.modal-content .hd_img {
+ width: 170rpx;
+ height: 170rpx;
+ border-radius: 5px;
+}
+
+.ctent_txt {
+ margin-left: 30rpx;
+ text-align: left;
+}
+
+.txt1 {
+ font-size: 34rpx;
+ font-weight: bold;
+}
+
+.txt2 {
+ font-size: 30rpx;
+ color: #999;
+ margin-top: 20rpx;
+}
+
+.arrow-right {
+ width: 20rpx;
+ height: 40rpx;
+ position: relative;
+ top: 13rpx;
+ margin-left: 20rpx;
+}
+
+.m_ta {
+ margin-top: 50rpx;
+}
+
+.g_img {
+ width: 350rpx;
+ height: 350rpx;
+}
+
+.s_sao {
+ font-size: 27rpx;
+ margin-top: 25rpx;
+}
+
+.gr_box {
+ position: relative;
+ height: 16rpx;
+ background-color: #fff;
+ border-radius: 8rpx;
+ overflow: hidden;
+}
+.gr_box_item{
+ height: 16rpx;
+ background-color: #999;
+}
+
+.canvas_box{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ /* margin-top: 20rpx; */
+}
+.numfont {
+ font-size: 28rpx;
+}
\ No newline at end of file
diff --git a/components/diy_user_info/style1.wxml b/components/diy_user_info/style1.wxml
new file mode 100644
index 0000000..88bb7a9
--- /dev/null
+++ b/components/diy_user_info/style1.wxml
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{pulscardname}}
+
+
+
+
+
+
+ {{userInfo.nickname}}
+
+
+ {{qy_data.GradeName}}
+
+
+
+
+ {{" "}}
+ {{rfmName}}
+ {{qy_data.cz_val}} / {{qy_data.need_money}}
+
+
+ {{" "}}
+
+ {{rfmName}}{{cz_val}}
+
+
+
+
+
+
+
+
+
+
+
+ 请点击注册
+
+
+
+
+
+
+ 会员卡
+
+
+
+ {{rfmName}}
+
+
+
+
+
+ 0/0
+
+
+
+
+
+
+
+
+
+ {{yuer?yuer:0}}
+ 余额
+
+
+
+ {{udata.Balance?udata.Balance:0}}
+ 储值款
+
+
+
+ {{udata.Integral?udata.Integral:0}}
+ 积分
+
+
+
+ {{udata.CashCount+byquan?udata.CashCount+byquan:0}}
+ 优惠券
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/diy_user_info/style2.wxml b/components/diy_user_info/style2.wxml
new file mode 100644
index 0000000..e8c4ac6
--- /dev/null
+++ b/components/diy_user_info/style2.wxml
@@ -0,0 +1,94 @@
+
+
+
+
+
+
+
+
+
+ {{pulscardname}}
+
+
+
+
+
+
+
+ {{userInfo.nickname}}
+
+
+ {{qy_data.GradeName}}
+
+
+
+
+ {{" "}}
+ {{rfmName}}
+ {{qy_data.cz_val}} / {{qy_data.need_money}}
+
+
+ {{" "}}
+ {{rfmName}} {{cz_val}}
+
+
+
+
+
+
+
+
+
+
+
+ 请点击注册
+
+
+
+
+
+
+ 会员卡
+
+
+
+ {{rfmName}}
+
+
+
+
+
+ 0/0
+
+
+
+
+
+
+
+
+
+ {{yuer?yuer:0}}
+ 余额
+
+
+
+ {{udata.Balance?udata.Balance:0}}
+ 储值款
+
+
+
+ {{udata.Integral?udata.Integral:0}}
+ 积分
+
+
+
+ {{udata.CashCount+byquan?udata.CashCount+byquan:0}}
+ 优惠券
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/diy_user_info/style3.wxml b/components/diy_user_info/style3.wxml
new file mode 100644
index 0000000..6ed3f7b
--- /dev/null
+++ b/components/diy_user_info/style3.wxml
@@ -0,0 +1,96 @@
+
+
+
+
+
+ {{userInfo.nickname}}
+
+
+
+ {{qy_data.GradeName}}
+
+
+
+
+
+
+ 距{{qy_data.nextGradeName}}还有{{qy_data.need_money-qy_data.cz_val}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{pulscardname}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 请点击注册
+
+
+
+
+
+
+ {{rfmName}}
+
+
+
+
+
+ 0/0
+
+
+
+
+
+
+
+
+
+ {{yuer?yuer:0}}
+ 余额
+
+
+
+ {{udata.Balance?udata.Balance:0}}
+ 储值款
+
+
+
+ {{udata.Integral?udata.Integral:0}}
+ 积分
+
+
+
+ {{udata.CashCount+byquan?udata.CashCount+byquan:0}}
+ 优惠券
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/diy_user_my_rights/diy_user_my_rights.js b/components/diy_user_my_rights/diy_user_my_rights.js
new file mode 100644
index 0000000..4867e23
--- /dev/null
+++ b/components/diy_user_my_rights/diy_user_my_rights.js
@@ -0,0 +1,61 @@
+var os = getApp().globalData.setting;
+Component({
+ properties: {
+ object: {
+ type: Object,
+ value: null
+ },
+ qy_data:{
+ type: Object,
+ value: null
+ },
+ b_gift:{
+ type: Object,
+ value: null
+ },
+ },
+ data: {
+ iurl:os.imghost,
+ qy_list:[]
+ },
+ methods: {
+
+ //
+ clike_banne: function () {
+ var th = this;
+ var actId = th.properties.b_gift.actId;
+ var giftbagid = th.properties.b_gift.giftbagid;
+
+ if (actId != "" && giftbagid != "") {
+ getApp().goto("/pages/giftpack/birthdaygift/birthdaygift?actId=" + actId + "&gifbagid=" + giftbagid + "&orderType=" + 3);
+ } else {
+ getApp().showWarning("请稍后重试");
+ }
+ },
+
+ //--跳转到权益页面--
+ go_qy: function () {
+ if (!getApp().globalData.userInfo) return false;
+ var url = "/pages/user/userqy/userqy";
+ getApp().goto(url);
+ },
+ },
+ observers: {
+ // 监听 num1 和 num2 数据的变化
+ 'qy_data': function(obj){
+ console.log(1111);
+ console.log(obj);
+ if(obj){
+ //4个4个一组
+ let arr = new Array();
+ let ater=this.properties.object.show_num;
+ let arr_data= this.properties.qy_data.old_qy_list
+ for (let i = 0; i < arr_data.length; i += ater) {
+ arr.push(arr_data.slice(i, i + ater));
+ }
+ this.setData({qy_list:arr})
+ }
+ }
+ },
+
+})
\ No newline at end of file
diff --git a/components/diy_user_my_rights/diy_user_my_rights.json b/components/diy_user_my_rights/diy_user_my_rights.json
new file mode 100644
index 0000000..9e7089c
--- /dev/null
+++ b/components/diy_user_my_rights/diy_user_my_rights.json
@@ -0,0 +1,3 @@
+{
+ "component": true
+ }
\ No newline at end of file
diff --git a/components/diy_user_my_rights/diy_user_my_rights.wxml b/components/diy_user_my_rights/diy_user_my_rights.wxml
new file mode 100644
index 0000000..e3a0629
--- /dev/null
+++ b/components/diy_user_my_rights/diy_user_my_rights.wxml
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+ 我的权益
+
+
+
+ 更多
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.PrivilegeName}}
+
+
+
+
+
+
+
+
+
+
+
+
+ 未找到数据
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/diy_user_my_rights/diy_user_my_rights.wxss b/components/diy_user_my_rights/diy_user_my_rights.wxss
new file mode 100644
index 0000000..6071e1c
--- /dev/null
+++ b/components/diy_user_my_rights/diy_user_my_rights.wxss
@@ -0,0 +1,105 @@
+@import '../../app.wxss';
+/* 我的权益 */
+.xc-my-equity-frame {
+ width: 100%;
+ height: 248rpx;
+}
+
+.xc-equity-title {
+ width: 100%;
+ height: 79rpx;
+ border-bottom: 1rpx solid #f2f2f2;
+}
+
+.xc-title-frame {
+ width: 85%;
+ height: 100%;
+}
+
+.xc-title-img {
+ width: 50rpx;
+ height: 50rpx;
+ margin-left: 20rpx;
+}
+
+.xc-title-content {
+ height: 100%;
+}
+
+.xc-more {
+ color: #878787;
+}
+
+.xc-more-frame {
+ width: 16.1%;
+ height: 100%;
+}
+
+
+.xc-more-click {
+ width: 15rpx;
+ height: 15rpx;
+ margin-left: 10rpx;
+ color: #898989;
+}
+
+.bg_right.bcolor,
+.bg_left.bcolor {
+ border-color: #333;
+}
+
+.bg_right.mt {
+ margin-top: -9rpx;
+}
+
+.bg_right.mt2 {
+ margin-top: -5rpx;
+}
+
+
+.xc-specific-more-frame {
+ width: 100%;
+ height: 169rpx;
+ padding-left: 43rpx;
+}
+
+.xc-specific-more-frame .xc-left {
+ width: 20rpx;
+ height: 20rpx;
+}
+
+.xc-specific-more-frame .xc-middle {
+ width: 100%;
+ margin-left: 2%;
+ height:100%;
+ align-items: center;
+}
+.xc-center-frame {
+ width: 20%;
+ margin-right: 5%;
+}
+.xc-center-img {
+ width: 60rpx;
+ height: 60rpx;
+}
+
+/*---生日营销的显示 ---*/
+.banner-img {
+ width: 95%;
+ height: 140rpx;
+ border-radius: 10px 10px 0px 0px;
+ margin-bottom: -5rpx;
+
+}
+
+.banner-frame {
+ width: 100%;
+ background: #f2f2f2;
+ padding-top: 20rpx;
+}
+
+button::after {
+ border: 0
+}
+
+
diff --git a/components/diy_user_order/diy_user_order.js b/components/diy_user_order/diy_user_order.js
new file mode 100644
index 0000000..12c6583
--- /dev/null
+++ b/components/diy_user_order/diy_user_order.js
@@ -0,0 +1,33 @@
+var os = getApp().globalData.setting;
+Component({
+ properties: {
+ object: {
+ type: Object,
+ value: null
+ },
+ // 统计相关的
+ toji:{
+ type: Object,
+ value: null
+ },
+
+ },
+ data: {
+ iurl:os.imghost,
+ },
+ methods: {
+
+ //跳转到订单的优化
+ go_order: function (e) {
+ if (!getApp().globalData.user_id)
+ {
+ getApp().goto('/packageE/pages/togoin/togoin');
+ return false;
+ };
+ var url = e.currentTarget.dataset.url;
+ wx.navigateTo({
+ url: url,
+ })
+ },
+ }
+})
\ No newline at end of file
diff --git a/components/diy_user_order/diy_user_order.json b/components/diy_user_order/diy_user_order.json
new file mode 100644
index 0000000..9e7089c
--- /dev/null
+++ b/components/diy_user_order/diy_user_order.json
@@ -0,0 +1,3 @@
+{
+ "component": true
+ }
\ No newline at end of file
diff --git a/components/diy_user_order/diy_user_order.wxml b/components/diy_user_order/diy_user_order.wxml
new file mode 100644
index 0000000..55249dd
--- /dev/null
+++ b/components/diy_user_order/diy_user_order.wxml
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+ 我的订单
+
+
+ 您有{{countDadaOrder}}个同城配送订单
+
+
+ 更多
+
+
+
+
+
+
+
+
+
+
+
+ 待付款
+ {{toji.wait_pay}}
+
+
+
+
+
+ 待发货
+ {{toji.wait_send}}
+
+
+
+
+
+
+ 待收货
+ {{toji.wait_receive}}
+
+
+
+
+
+
+ 待评论
+ {{toji.wait_pj}}
+
+
+
+
+
+
+
+ 售后/退款
+
+
+
+
+
+
+
diff --git a/components/diy_user_order/diy_user_order.wxss b/components/diy_user_order/diy_user_order.wxss
new file mode 100644
index 0000000..90c0118
--- /dev/null
+++ b/components/diy_user_order/diy_user_order.wxss
@@ -0,0 +1,92 @@
+@import '../../app.wxss';
+.xc-after-sale {
+ width: 100%;
+}
+.xc-after-sale-left {
+ width: 96%;
+ height: 100%;
+ margin-top: 40rpx;
+ margin-bottom: 25rpx;
+}
+
+.xc-equity-title {
+ width: 100%;
+ height: 79rpx;
+ border-bottom: 1rpx solid #f2f2f2;
+}
+.xc-title-img {
+ width: 50rpx;
+ height: 50rpx;
+ margin-left: 20rpx;
+}
+
+
+.xc-title-frame {
+ width: 85%;
+ height: 100%;
+}
+.xc-title-content {
+ height: 100%;
+}
+.xc-more-frame {
+ width: 16.1%;
+ height: 100%;
+}
+.xc-more {
+ color: #878787;
+}
+
+.xc-more-click {
+ width: 15rpx;
+ height: 15rpx;
+ margin-left: 10rpx;
+ color: #898989;
+}
+
+
+.bg_right.bcolor,
+.bg_left.bcolor {
+ border-color: #333;
+}
+
+.bg_right.mt {
+ margin-top: -9rpx;
+}
+
+.bg_right.mt2 {
+ margin-top: -5rpx;
+}
+
+.xc-no-money {
+ width: auto;
+ height: 50rpx;
+}
+
+.xc-send {
+ width: auto;
+ height: 50rpx;
+}
+.xc-await {
+ width: auto;
+ height: 50rpx;
+}
+
+
+.xc-word-color {
+ color: #595758;
+ top: 61rpx;
+ width: 110rpx;
+ right: -28rpx;
+}
+.order-num {
+ position: absolute;
+ right: 0rpx;
+ top: -18rpx;
+ width: 35rpx;
+ height: 35rpx;
+ line-height: 35rpx;
+ font-size: 22rpx;
+ border-radius: 50%;
+ background-color: rgba(217, 81, 99, 0.9);
+ color: #fff;
+}
diff --git a/components/diy_user_tools_services/diy_user_tools_services.js b/components/diy_user_tools_services/diy_user_tools_services.js
new file mode 100644
index 0000000..4935ff6
--- /dev/null
+++ b/components/diy_user_tools_services/diy_user_tools_services.js
@@ -0,0 +1,250 @@
+const ut = require("../../utils/util.js");
+var os = getApp().globalData.setting;
+Component({
+ properties: {
+ object: {
+ type: Object,
+ value: null
+ },
+ f_user_tool: {
+ type: Object,
+ value: null
+ },
+ c_list: {
+ type: Object,
+ value: null
+ },
+ qy_data: {
+ type: Object,
+ value: null
+ },
+ // 这里定义了innerText属性,属性值可以在组件使用时指定
+ //-- 是不是初始化了 --
+ is_dengji:{
+ type:Number,
+ value:0
+ },
+ //-- 是不是有助力活动 --
+ is_assistance:{
+ type:Number,
+ value:0
+ },
+ enableMeiye:{
+ type:Number,
+ value:0
+ }
+ },
+
+ data: {
+ iurl:os.imghost,
+ sys_switch:null,
+ userInfo:null,
+ hiddenCS: true,
+ },
+
+ ready: function() {
+
+ var th=this;
+
+ if(getApp().globalData.userInfo){
+ this.setData({userInfo:getApp().globalData.userInfo});
+ }
+
+ /*-------系统是否开通等级卡,会员是等级卡-----*/
+ getApp().getConfig2(function (e) {
+ var t_swi = e.switch_list;
+ if (t_swi) t_swi = JSON.parse(t_swi)
+ if (t_swi) {
+ th.setData({sys_switch: t_swi});
+ }
+ })
+ let img_host=this.data.iurl;
+
+ },
+
+ methods: {
+ // 这里是一个自定义方法
+ goto_nav: function (e) {
+ var th = this;
+ var url = e.currentTarget.dataset.url;
+ if (th.data.userInfo != null) {
+ console.log('跳转');
+ getApp().goto(url);
+ } else {
+ wx.navigateTo({
+ url: '/packageE/pages/togoin/togoin',
+ })
+ }
+ },
+ //跳转到链接
+ goto: function (e) {
+ console.log(e);
+ console.log('跳转');
+ var url = e.currentTarget.dataset.url;
+ wx.navigateTo({ url: url })
+ // getApp().goto(url);
+ },
+ //--跳转到权益页面--
+ go_qy: function () {
+ if (!this.data.userInfo) return false;
+ var url = "/pages/user/userqy/userqy";
+ getApp().goto(url);
+ },
+
+ openCS() {
+ let self=this;
+ // 判断会员状态
+ let user_info = getApp().globalData.userInfo;
+ if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) {
+ wx.navigateTo({
+ url: '/packageE/pages/togoin/togoin',
+ })
+ return false;
+ };
+ // csType/在线客服设置:
+ // 0关闭(如果有设置热线电话,则显示拨打热线电话)、
+ // 1小程序客服、
+ // 2企业微信客服
+ if (this.data.sys_switch) {
+ let csType = this.data.sys_switch.weapp_customertype;
+ if (csType == 0) {
+ // 拨打电话号码
+ this.contactService();
+ } else {
+ this.getTel()
+ .then(() => {
+ self.setData({
+ hiddenCS: false,
+ });
+ });
+ }
+ }
+ },
+
+ //---------联系客服------------
+ contactService: function () {
+ getApp().com_call(this);
+ },
+
+ //关闭客服操作菜单
+ closeCS() {
+ this.setData({
+ hiddenCS: true,
+ });
+ },
+
+ //添加卡包
+ addcard: function () {
+ var res = this.data.add_card_data;
+ if (!res) return false;
+
+ var arr = new Array(6)
+ arr[0] = res.code;
+ arr[1] = res.timestamp;
+ arr[2] = res.jsapiTicket;
+ arr[3] = res.openid;
+ arr[4] = res.cardid;
+ arr[5] = res.nonceStr;
+ var c = arr.sort();
+ var newstr = "";
+ for (var i = 0; i < c.length; i++) {
+ newstr += c[i];
+ }
+
+ var sh1 = ut.sha1(newstr);
+ wx.addCard({
+ cardList: [
+ {
+ cardId: res.cardid,
+ cardExt: '{"code": "' + res.code + '", "openid": "' + res.openid + '","timestamp": "' + res.timestamp + '","nonce_str":"' + res.nonceStr + '","outer_str":"web", "signature":"' + sh1 + '"}'
+ }
+
+ ],
+ success: function (res) { },
+ cancel: function (res) { }
+ });
+ },
+
+ // 获取客服热线
+ getTel() {
+ var self = this;
+ return new Promise((resolve, reject) => {
+ var s = getApp();
+ s.getConfig(function (t) {
+ if (t.store_tel == undefined) {
+ getApp().request.get("/api/weshop/store/get/" + os.stoid, {
+ isShowLoading: 1,
+ data: {},
+ success: function (rs) {
+ getApp().globalData.config = rs.data.data;
+ if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
+ getApp().showWarning("商家未设置电话");
+ return false;
+ } else {
+ self.setData({
+ store_tel: rs.data.data.store_tel,
+ });
+ // s.confirmBox("客服热线:" + rs.data.data.store_tel);
+ };
+
+ }
+ })
+ } else {
+ self.setData({
+ store_tel: t.store_tel,
+ });
+ // s.confirmBox("客服热线:" + t.store_tel);
+ }
+ resolve();
+ });
+ });
+ },
+
+
+
+ },
+
+ observers: {
+ // 监听 num1 和 num2 数据的变化
+ 'f_user_tool': function(obj){
+ console.log(1111);
+ console.log(obj);
+ if(obj){
+ var f_user_tool=JSON.parse(JSON.stringify(obj));
+ var list=this.properties.object.list;
+
+ if(list && list.length) {
+ //进行循环
+ for (let iu = 0; iu < list.length; iu++) {
+ let fd = f_user_tool.find(function (e) {
+ return e.id == list[iu].id;
+ })
+ if (fd) {
+ list[iu].icoimg = fd.icoimg;
+ list[iu].new_weappurl = fd.new_weappurl;
+ } else {
+ list.splice(iu, 1);
+ iu--;
+ }
+ }
+ }else{
+ list=[];
+ }
+ //-- 如果是有新的tool要添加进去 --
+ for (let ig = 0; ig
+
+
+
+ 工具与服务
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PLUS会员
+
+
+
+
+
+ 助力活动
+
+
+
+
+
+ 我的权益
+
+
+
+
+
+ 套盒商品
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
+ 联系客服
+
+
+
+
+
+
+ 收入卡包
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/diy_user_tools_services/diy_user_tools_services.wxss b/components/diy_user_tools_services/diy_user_tools_services.wxss
new file mode 100644
index 0000000..6810495
--- /dev/null
+++ b/components/diy_user_tools_services/diy_user_tools_services.wxss
@@ -0,0 +1,42 @@
+@import '../../app.wxss';
+.xc-center-img {
+ width: 60rpx;
+ height: 60rpx;
+}
+
+/* 工具与服务 */
+.xc-tool-service {
+ width: 100%;
+ border-bottom: 20rpx solid #f2f2f2;
+ padding-bottom: 30rpx;
+}
+
+.xc-tool-service .xc-tool-service-title {
+ width: 100%;
+ height: 90rpx;
+
+}
+
+
+.xc-tool-service-img {
+ width: 38rpx;
+ height: 38rpx;
+ margin-left: 30rpx;
+}
+
+.xc-tool-service-word {
+ margin-left: 10rpx;
+}
+
+.xc-project-frame {
+ width: 100%;
+}
+
+.xc-project-frame .item {
+ width: 25%;
+ margin-top: 30rpx;
+ display: inline-block;
+ line-height: 40rpx;
+ margin-left: 0 !important;
+ margin-right: 0 !important;
+}
\ No newline at end of file
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index 55558dc..12a15d4 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -5038,14 +5038,14 @@ Page({
} else {
wx.navigateTo({
- url: "/pages/team/team_show/team_show?tg_id=" + id,
+ url: "/packageG/pages/team/team_show/team_show?tg_id=" + id,
});
}
}
//--跳转到参团--
else {
wx.navigateTo({
- url: "/pages/team/team_show/team_show?tg_id=" + id,
+ url: "/packageG/pages/team/team_show/team_show?tg_id=" + id,
});
}
}
diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index f73c883..4abcba1 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -555,8 +555,9 @@ Page({
})
if (pt_res) {
for (let io = 0; io {
+ if(res.data.code==0){
+ getApp().globalData.guide_id=res.data.data.id;
+ getApp().globalData.guide_pick_id= res.data.data.pickup_id
+ }
+ })
+ }
+ this.setData({tg_id: tg_id,goods_id});
+ getApp().globalData.to_group=null;
+
+ var th=this;
+ getApp().getConfig2(function(e) {
+ var json_d = JSON.parse(e.switch_list);
+ th.setData({ bconfig: e,sys_switch:json_d});
+ th.wait_for_store_config(); //获取默认的门店
+ })
+ try {
+ let template_id =await getApp().get_template_id('1023')
+ this.setData({
+ template_id
+ })
+ } catch (error) {}
+
+ },
+
+ //显示加载
+ onShow:function(){
+ //-- 看一下隐私政策要不要显示 --
+ var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
+ if (privacy_pop) {
+ privacy_pop.check_pri_show();
+ }
+
+ getApp().check_can_share();
+ var tg_id = this.data.tg_id,th=this;
+ this.init(tg_id);
+ },
+
+ //c点击打开拼团弹窗
+ cpd: function() {
+ this.setData({ pd_xx: true,})
+ },
+
+ //点击关闭拼团弹窗
+ close_pt_xx: function() {
+ this.setData({ pd_xx: false, })
+ },
+ //天天拼团订阅消息提醒
+ sendsm: function (ee) {
+ let th = this;
+ var template_id = this.data.template_id;
+ // //授权订阅
+ wx.requestSubscribeMessage({
+ tmplIds: template_id,
+ success(res) {
+ th.cyijian(ee);
+ },
+ fail(res) {
+ th.cyijian(ee);
+ }
+ })
+ },
+ //按钮点击一键参加团按钮
+ cyijian: function(e) {
+ //--先判断会员状态--
+ var user_info=getApp().globalData.userInfo;
+ if(user_info==null || user_info.mobile==undefined || user_info.mobile=="" || user_info.mobile==null){
+ wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
+ return false;
+ }
+
+ var is_kt_or_ct=e.currentTarget.dataset.isct;
+ this.setData({
+ yijian: true,is_kt_or_ct:is_kt_or_ct,
+ })
+ },
+ //关闭展开列表
+ click: function(e) {
+ this.setData({
+ hiddenName: !this.data.hiddenName,
+ zk: !this.data.zk,
+ })
+ },
+ //打开收起拼团列表
+ czk: function(e) {
+ this.setData({
+ zk: !this.data.zk,
+ hiddenName: !this.data.hiddenName,
+ })
+ },
+ //关闭购买页面
+ cbcou: function(e) {
+ this.setData({
+ yijian: false,
+ })
+
+ },
+ //qh点击取货
+ cqh: function(e) {
+ if(this.data.ssl) {
+ this.setData({
+ qh: false,
+ xz: true,
+ one: true,
+ })
+ }else{
+ this.setData({
+ qh: false,
+ xz: true,
+ one: false,
+ list:1,
+ })
+ }
+
+ },
+
+ //cxz点击选择门店
+ cxz: function(e) {
+ this.setData({
+ qh: true,
+ xz: false,
+ one: false,
+ })
+ },
+ //ccc点击选择的
+ sel: function(e) {
+ this.setData({
+ list: false,
+ se: false,
+ one: true,
+ xz: true,
+ })
+ },
+ //list点击底二层
+ clist: function(e) {
+ var i = e.currentTarget.dataset.end;
+ var pick_id = e.currentTarget.dataset.pick_id;
+ var pick_dis = e.currentTarget.dataset.pick_dis;
+
+ this.setData({
+ end_name: i,
+ pick_id: pick_id,
+ ii: 1,
+ qh: true,
+ se: false,
+ list: false,
+ pick_dis: pick_dis
+ })
+ },
+
+ //点击第一层
+ setchild: function(e) {
+ var ind = e.currentTarget.dataset.bindex;
+ var nn = e.currentTarget.dataset.bname;
+ console.log(nn);
+ var list = this.data.ssl[ind].s_arr;
+ this.setData({
+ ssl_child: list,
+ sele_dl_name: nn,
+ xz: false,
+ one: false,
+ list: true,
+ se: true
+ });
+ },
+
+ //事件处理函数
+ /*点击减号*/
+ bindMinus: function() {
+ var num = this.data.num;
+ if (num > 1) {
+ num--;
+ }
+ var minusStatus = num > 1 ? 'normal' : 'disable';
+ this.setData({
+ num: num,
+ minusStatus: minusStatus,
+ })
+ },
+
+ /*点击加号*/
+ bindPlus: function() {
+ var th=this;
+ var num = this.data.num;
+ var ii = this.data.ii;
+ var minusStatus = num > 1 ? 'normal' : 'disable';
+
+ num++;
+ //要判断库存数量,限购数量
+ th.check_num(num,minusStatus);
+
+ },
+
+ async check_num(num,minusStatus){
+
+ var gd=this.data.goods;
+ var th=this;
+ var user_id=getApp().globalData.user_id;
+ var promgoodsbuynum=0;
+ var goodsbuynum=0;
+ getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
+ data: {
+ store_id: os.stoid,
+ user_id: user_id,
+ goods_id: gd.goods_id,
+ prom_type: gd.prom_type,
+ prom_id: gd.prom_id, isnew:1
+
+ },
+ }).then(res=>{
+ var buy_num_data=res.data.data;
+ if(buy_num_data.promgoodsbuynum) promgoodsbuynum=buy_num_data.promgoodsbuynum;
+ goodsbuynum=buy_num_data.goodsbuynum;
+ })
+
+ //先判断限购
+ if (num+goodsbuynum>gd.viplimited && gd.viplimited>0) {
+ getApp().confirmBox("超出商品限购");
+ return false;
+ }
+ if (num+promgoodsbuynum>th.data.teamlist.buy_limit && th.data.teamlist.buy_limit>0) {
+ getApp().confirmBox("超出活动限购");
+ return false;
+ }
+ //判断库存
+ if ( num>gd.store_count) {
+ getApp().confirmBox("超出商品库存");
+ return false;
+ }
+ var r_num=0;
+ await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/6/" + th.data.teamlist.id, {
+ 1: 1
+ }).then(res => {
+ var em = res;
+ if (em.data.code == 0) {
+ r_num=em.data.data;
+ }
+ })
+ //--判断库存---
+ if ( num>r_num) {
+ getApp().confirmBox("超出商品库存");
+ return false;
+ }
+
+ this.setData({
+ num: num,
+ minusStatus: minusStatus,
+ })
+
+ },
+
+ /*输入框事件*/
+ bindManual: function(e) {
+ var num = e.detail.value;
+ var minusStatus = num > 1 ? 'normal' : 'disable';
+ this.setData({
+ num: num,
+ minusStatus: minusStatus
+ })
+ },
+
+ //---------------初始化代码----------------
+ async init(tg_id) {
+ var goods_id = 0, //商品ID,
+ pageteam = null, //
+ original_img = null, //商品图片
+ ee = this,
+ ordertx = [],
+ teamlist = null, //活动表
+ goods = null, //商品
+ teamgroup = null, //活動从表
+ max_num = 0,
+ min_price = 0,
+ th=this,
+ that=th,
+ flag=null;
+ await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/2",{
+ data:{
+ store_id: os.stoid,
+ is_end: 0,
+ is_show: 1,
+ user_id: getApp().globalData.user_id,
+ pageSize:1000
+ }
+ }).then(res=>{
+ let pd_list=res.data.data.pageData;
+ if(res.data.code==0 && pd_list.length>0){
+ flag =pd_list.some(pd=>{
+ // if(th.data.goods_id){
+ return pd.goods_id==th.data.goods_id;
+ // }
+ })
+ }
+ })
+ if(!flag){
+ wx.showToast({title: "当前会员身份不符,无法参与", icon: 'none', duration: 3000});
+ setTimeout(function () {
+ ut.wx_back();
+ }, 1000)
+ return false;
+ }
+
+ //获取活动从表信息team_id,listno团编号(券号)
+ await getApp().request.promiseGet("/api/weshop/teamgroup/get/"+os.stoid+"/"+tg_id, {
+ }).then(res => {
+
+ if(res.data.code !=0 ){
+ getApp().showWarning(res.data.msg);
+ th.go_back();
+ return false;
+ }
+
+ if(res.data && res.data.data ) {
+
+ teamgroup = res.data.data;
+ //获取当前时间,并且判断剩余时间
+ var nt = ut.gettimestamp();
+ var buy_start_date = ut.formatTime(teamgroup.buy_start_date, "yyyy-MM-dd hh:mm:ss");
+ ee.setData({
+ pindGoods: teamgroup,
+ buy_start_date: buy_start_date
+ });
+
+ if(nt>teamgroup.kt_end_time) {
+ th.setData({is_group_end:1,end_text:"团期已经结束"})
+ }
+ if(teamgroup.state==1) {
+ th.setData({is_group_end:1,end_text:"团期已经结束"})
+ }
+ if(teamgroup.state==3 || teamgroup.state==4 || teamgroup.state==5 ) {
+ th.setData({is_group_end:2,end_text:"团期已满"})
+ }
+
+ }
+ })
+
+ if(!teamgroup || !teamgroup.listno){
+ ut.m_toast('未找到团号');
+ th.go_back();
+ return false;
+ }
+
+ //判断是不是要继续的开关
+ var is_ok=1;
+
+ //要先读取订单,看自己有没有买过该团的商品
+ await getApp().request.promiseGet("/api/weshop/order/page", {
+ data: {
+ pt_prom_id:teamgroup.team_id,
+ user_id: oo.user_id,
+ store_id: os.stoid,
+ pageSize: 1,
+ page: 1
+ }
+ }).then(res => {
+ var e=res;
+ if (e.data.code != 0) {
+ getApp().showWarning("读取订单失败");
+ th.go_back();
+ is_ok=0;
+ return fasle;
+ }
+ //--跳转到已经购买的情况--
+ if (e.data.data.pageData.length > 0) {
+ var odr = e.data.data.pageData[0];
+ //还未支付
+ if (odr.pt_status == 0 && odr.order_status == 1) {
+ wx.navigateTo({
+ url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id,
+ });
+ is_ok=0;
+ }else if (odr.pt_status == 1 && odr.order_status == 1){
+ wx.navigateTo({
+ url: "/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn,
+ });
+ is_ok=0;
+ }
+ }
+ })
+ if(!is_ok) return false;
+
+ //获取活动表的信息根据活动team_id
+ await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + teamgroup.team_id, {
+ data: {}
+ }).then(res => {
+ if (res.data.code == 0) {
+ teamlist = res.data.data;
+ goods_id = res.data.data.goods_id;
+ //----------查看阶梯团------------
+ if (teamlist.ct_rylist != "" && teamlist.ct_rylist != null && teamlist.ct_rylist != undefined) {
+ var ct_rylist = JSON.parse(teamlist.ct_rylist);
+ var max = 0; var pri = 0;
+ ct_rylist.forEach(function (val, ind) {
+ if (val.rynum > max) {
+ max = val.rynum;
+ pri = val.price;
+ }
+ })
+ max_num = max;
+ min_price = pri;
+ }
+
+ }
+ })
+
+ if(!teamlist){
+ getApp().showWarning("未找到活动");
+ is_ok=0;
+ }else{
+ if(teamlist.is_end==1){
+ getApp().showWarning("拼单活动已经结束"); is_ok=0;
+ }
+ var now=ut.gettimestamp();
+ if(teamlist.end_time {
+ ordertx = res.data.data.pageData;
+ })
+
+ //获取商品信息
+ await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, {
+ }).then(res => {
+ //商品地址
+ original_img = ee.data.imageurl + res.data.data.original_img,
+ goods = res.data.data
+ })
+
+ //显示商品规格
+ var gg = "";
+ if(goods.goods_spec=="null" || goods.goods_spec==null ) goods.goods_spec="";
+ if(goods.goods_color=="null" || goods.goods_color==null) goods.goods_color="";
+
+ if (goods.goods_spec != "" && goods.goods_color != "") {
+ gg = goods.goods_spec + "/" + goods.goods_color;
+ } else if (goods.goods_spec != "" || goods.goods_color != "") {
+ gg = goods.goods_spec + goods.goods_color;
+ } else {
+ gg = "规格1";
+ }
+ goods.gg = gg;
+
+ //只装5个
+ var ordertx2 = [], sf_num = 0, ct_nun = teamlist.ct_num;
+ if (max_num) {
+ ct_nun = parseInt(max_num);
+ if (ct_nun < ordertx.length) ct_nun = ordertx.length;
+ }
+
+ if (ct_nun > 5) ct_nun = 5;
+ for (var i = 0; i < ct_nun; i++) {
+ if (i >= ordertx.length) sf_num++
+ else
+ ordertx2.push(ordertx[i]);
+ }
+
+ var sf_arr = [];
+ for (var i = 0; i < sf_num; i++) {
+ sf_arr.push(i);
+ }
+
+
+
+ if(th.data.is_group_end==1 || th.data.is_group_end==2 ){
+ getApp().confirmBox(th.data.end_text);
+ wx.redirectTo({
+ url: "/pages/goods/goodsInfo/goodsInfo?goods_id=" + goods.goods_id,
+ });
+ return false;
+ }
+
+ //--当是会员团的时候才显示倒计时多久可以参团--
+ if(teamlist.kttype==2) {
+ //显示判断多久才能购买商品,获取没有支付的会员
+ await getApp().request.promiseGet("/api/weshop/teamgroup/getTeamUser/" + os.stoid + "/" + teamgroup.id, {
+ 1: 1
+ }).then(res => {
+ var em = res;
+ if (em.data.code == 0) {
+ var tg_list = em.data.data.split("|");
+ var t_obj = {};
+ t_obj.order_id = tg_list[0];
+ t_obj.time = parseFloat(tg_list[1]) + 5 * 60; //五分钟后
+ t_obj.user_name = tg_list[2];
+ th.setData({tg_arr: t_obj})
+ }
+ })
+ }
+
+ //获取大家都在团信息
+ await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/"+os.stoid, {
+ data: {
+ pageSize: 2,
+ page: 1,
+ store_id: 1,
+ is_end: 0,
+ is_show: 1
+ }
+ }).then(res => {
+ if(ut.ajax_ok(res)){
+ pageteam = res.data.data.pageData;
+ }
+ });
+
+ //-- 获取用户的默认门店 --
+ getApp().get_user_store(function(ee) {
+ if(!ee) {
+ th.data.fir_def_store={}; //赋值空对象
+ return false;
+ }
+
+ if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
+ //--定时器推迟一下--
+
+ var appd=getApp().globalData;
+ var w_time = setInterval(function() {
+ if (that.data.is_get_local_ok == 0) return false;
+ if(!th.data.goods) return false;
+ var g_distr_type=th.data.goods.distr_type;
+ //--如果默认门店的配送方式不对,就不能被选择--
+ if(ee.distr_type!=0 && g_distr_type!=0 && ee.distr_type!=g_distr_type ){
+ //th.data.fir_def_store={}; //赋值空对象
+ //return false;
+ ee.is_no_dis=1;
+ }
+
+ clearInterval(w_time);
+
+ var distance = null;
+ var e=JSON.parse(JSON.stringify(ee));
+
+ //如果有开启近距离的话,同时距离优不一样了
+ if (that.data.lat != null) {
+ //如果经纬度有变化的话
+ if( appd.lat==that.data.lat && appd.lon==that.data.lon && e.distance>0 ){
+ that.data.fir_def_store=e;
+ that.setData({
+ def_pick_store: e,
+ sto_sele_name: e.pickup_name,
+ sto_sele_id: e.pickup_id,
+ sto_sele_distr: e.distr_type
+ })
+ }else{
+ //要用接口是获取距离,js的计算不准
+ getApp().request.promiseGet("/api/weshop/pickup/list",{
+ data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon,is_pos: 1},
+ }).then(res=>{
+ if(ut.ajax_ok(res)){
+ e=res.data.data.pageData[0];
+ if (e){
+ appd.pk_store=e;
+ that.data.fir_def_store=e;
+ that.setData({
+ def_pick_store: e,
+ sto_sele_name: e.pickup_name,
+ sto_sele_id: e.pickup_id,
+ sto_sele_distr: e.distr_type
+ })
+ }
+
+ }
+ })
+ }
+
+ //e.distance = distance;
+ appd.lat=that.data.lat;
+ appd.lon=that.data.lon;
+
+ }else{
+ if (e) {
+ e.distance = null;
+ that.data.fir_def_store=e;
+ that.setData({
+ def_pick_store: e,
+ sto_sele_name: e.pickup_name,
+ sto_sele_id: e.pickup_id,
+ sto_sele_distr: e.distr_type
+ })
+ }
+ }
+
+ }, 500)
+
+ });
+
+ //获取下redis长度,如果团已经弄完,或者拼单已经卖完
+ //设置值
+ ee.setData({
+ ordertx2: ordertx2,
+ ordertx: ordertx,
+ teamlist: teamlist,
+ teamgroup: teamgroup,
+ goods: goods,
+ pageteam: pageteam,
+ image: original_img,
+ is_show:1,
+ sf_arr: sf_arr
+ });
+ ee.countDown2();
+ //---设置门店---
+ ee.get_sto();
+ //---定时设置一下待支付的订单---
+ ee.time_out();
+ },
+
+ onHide:function(){
+ this.setData({is_show:0,});
+ },
+ go_back:function(){
+ if(getCurrentPages()>1)
+ wx.navigateBack({delta: 1})
+ else
+ wx.navigateTo({
+ url: "/pages/index/index/index"
+ });
+ },
+ //---小于10的格式化函数----
+ timeFormat(param) {
+ return param < 10 ? '0' + param : param;
+ },
+ countDown2() {
+ var th = this;
+ // 获取当前时间,同时得到活动结束时间数组
+ var newTime = ut.gettimestamp();
+ var o = this.data.pindGoods;
+ var endTime = o.kt_end_time;
+
+ let obj = null;
+ // 如果活动未结束,对时间进行处理
+ if (endTime - newTime > 0) {
+ let time = (endTime - newTime);
+ // 获取天、时、分、秒
+ let day = parseInt(time / (60 * 60 * 24));
+ let hou = parseInt(time % (60 * 60 * 24) / 3600);
+ let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
+ let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
+ obj = {
+ day: this.timeFormat(day),
+ hou: this.timeFormat(hou),
+ min: this.timeFormat(min),
+ sec: this.timeFormat(sec)
+ }
+ } else {
+ //活动已结束,全部设置为'00'
+ obj = {
+ day: '00',
+ hou: '00',
+ min: '00',
+ sec: '00'
+ }
+ }
+ var txt = "pindGoods.djs";
+ th.setData({
+ obj: obj
+ });
+ setTimeout(th.countDown2, 1000);
+ },
+
+ //------去支付,购买-------
+ go_pay:function () {
+ var th=this;
+ var def_pick_store=this.data.def_pick_store;
+ if(def_pick_store && def_pick_store.pickup_id) {
+ th.data.pick_id=def_pick_store.pickup_id; //选择门店
+ th.data.end_name=def_pick_store.pickup_name;
+ }
+ if (!th.data.pick_id) return s.my_warnning("请选择门店", 0, th);
+ if (th.data.pick_id==0) return s.my_warnning("请选择门店", 0, th);
+
+ //----判断起购数----
+ var qnum=parseFloat(th.data.teamlist.minbuynum);
+ if(qnum>0 && qnum>th.data.num ){
+ getApp().confirmBox("拼团商品至少要买"+qnum+"件!");
+ return false;
+ }
+ //先判断团的redis数量
+ this.buy_check_redis(function () {
+ var arr=th.data.redis_arr;
+ if(th.data.num>arr[0]){
+ if(arr[0]>0){
+ getApp().showWarning("超出活动库存");
+ }else{
+ getApp().showWarning("拼单已经抢光");
+ }
+ return false;
+ }
+ if(th.data.teamlist.kttype==2 && 1>arr[1]){
+ getApp().showWarning("拼团已满");
+ return false;
+ }
+
+ //--------------此时操作的数据------------
+ var newd = {
+ goods_id: th.data.goods.goods_id,
+ goods_num: th.data.num,
+ pick_id: th.data.pick_id,
+ user_id: oo.user_id,
+ store_id: th.data.stoid,
+ goods_name: th.data.goods.goods_name,
+ goods_sn: th.data.goods.goods_sn,
+ };
+
+ //---是不是从收藏夹出来的---
+ if(th.data.c_guide_id){
+ newd['guide_id'] = th.data.c_guide_id;
+ newd['guide_type']=2;
+
+ }else{
+ if(getApp().globalData.guide_id){
+ newd['guide_id'] = getApp().globalData.guide_id;
+ newd['guide_type']=0;
+
+ }
+ }
+
+ //-----拼团-----
+ newd.goods_price = th.data.teamlist.price;
+ newd.prom_type = 6;
+ newd.prom_id = th.data.teamlist.id;
+ newd.kt_type = th.data.teamlist.kttype; //开团类型
+ newd.is_pt_tz = 0;
+ newd.pick_name = th.data.end_name;
+ newd.pick_dis = 1;
+ newd.is_normal = 0;
+ //判断开团还是参团
+ switch (th.data.is_kt_or_ct) {
+ case "0":
+ //如果不是商家团,就要带团期号
+ if(th.data.teamlist.kttype>1){
+ newd.qh=th.data.teamgroup.listno;
+ }
+ break;
+ case "1":
+ //阶梯团和会员团都要设置is_pt_tz
+ if (newd.kt_type > 1) {
+ newd.is_pt_tz = 1; //开团类型
+ }
+ break;
+ }
+ newd['pick_dis'] = th.data.pick_dis;
+
+ if(getApp().globalData.guide_id){
+ newd['guide_id'] = getApp().globalData.guide_id;
+ newd['guide_type']=0;
+ }
+
+ s.set_b_now(newd);
+ wx.navigateTo({
+ url: "/packageE/pages/cart/cart2_pt/cart2_pt?is_bnow=1&goods_id=" + th.data.goods.goods_id,
+ });
+ });
+ },
+
+ //购买前的判断redis
+ async buy_check_redis(func){
+ //获取redis中的数量
+ var r_num=0,prom_type=6,prom_id=this.data.teamlist.id;
+ await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, {
+ 1: 1
+ }).then(res => {
+ var em = res;
+ if (em.data.code == 0) {
+ r_num=em.data.data;
+ }
+ })
+
+ //只有会员团要判断团的人数
+ var gr_num=0,grp_id=this.data.teamgroup.id;
+ if(this.data.teamlist.kttype==2){
+ await getApp().request.promiseGet("/api/weshop/activitylist/getActTuanLen/" + os.stoid + "/" + grp_id, {
+ 1: 1
+ }).then(res => {
+ var em = res;
+ if (em.data.code == 0) {
+ gr_num=em.data.data;
+ }
+ })
+ }
+ var arr=[];arr.push(r_num);arr.push(gr_num);
+ this.data.redis_arr=arr;
+ func();
+ },
+
+ //定时设置一下待支付的订单
+ time_out:function () {
+ var list=this.data.tg_arr,th=this;
+ if(!list) return false;
+ // 获取当前时间,同时得到活动结束时间数组
+ var newTime = ut.gettimestamp();
+ var endTime = list.time;
+
+ let obj = null;
+ // 如果活动未结束,对时间进行处理
+ if (endTime - newTime > 0) {
+ let time = (endTime - newTime);
+ // 获取天、时、分、秒
+ let day = parseInt(time / (60 * 60 * 24));
+ let hou = parseInt(time % (60 * 60 * 24) / 3600);
+ let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
+ let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
+ obj = {
+ day: th.timeFormat(day),
+ hou: th.timeFormat(hou),
+ min: th.timeFormat(min),
+ sec: th.timeFormat(sec)
+ }
+ } else {
+ //活动已结束,全部设置为'00'
+ obj = {
+ day: '00',
+ hou: '00',
+ min: '00',
+ sec: '00'
+ }
+
+ //调用接口清理订单,并且返回redis数量
+ th.back_order(function () {
+ th.setData({ tg_arr: null});
+ });
+ return false;
+ }
+ var txt = "pindGoods.djs";
+ th.setData({
+ r_obj: obj
+ });
+ setTimeout(th.time_out, 1000);
+ },
+
+ //清理订单,并且返回redis数量ss
+ back_order:function (func) {
+ var th=this;
+ //---取消订单---
+ getApp().request.delete("/api/weshop/order/cancelTeamOrder/"+th.data.stoid+"/"+th.data.tg_arr.order_id,{
+ data:{},
+ success: function(t) {
+ if(t.data.code==0){
+ th.setData({tg_arr:null})
+ }
+ },
+ })
+ },
+
+ go_goodsinfo:function (e) {
+ var gid=e.currentTarget.dataset.gid;
+ var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gid;
+ wx.navigateTo({ url: url, }) //跳到非tabbar页
+ },
+
+ gohome:function(){
+ getApp().goto("/pages/index/index/index");
+ },
+
+ //-----图片失败,默认图片-----
+ bind_bnerr: function (e) {
+ var _errImg = e.target.dataset.errorimg;
+ var _errObj = {};
+ _errObj[_errImg] = this.data.iurl + "/miniapp/images/default_g_img.gif";
+ this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+ },
+
+ //------ 分享配置 --------
+ onShareAppMessage: function (e) {
+ getApp().globalData.no_clear=1;
+ var curPage=this;
+ var pagePath = curPage.route; //当前页面url
+ if (pagePath.indexOf('/') != 0) {
+ pagePath = '/' + pagePath;
+ }
+ var url=pagePath;
+
+ //--分享图片--
+ img=th.data.iurl+th.data.teamlist.share_imgurl;
+ //--把会员分享出去--
+ if(getApp().globalData.user_id){
+ if(url.indexOf("?")>0)
+ url+="&first_leader="+getApp().globalData.user_id;
+ else
+ url+="?first_leader="+getApp().globalData.user_id;
+ }
+
+ if(url.indexOf('goods_id')==-1){
+ url+="&goods_id="+this.data.goods.goods_id;
+ }
+ if(url.indexOf('tg_id')==-1){
+ url+="&tg_id="+this.data.teamgroup.id;
+ }
+
+
+ return {
+ path:url,
+ title: "商品分类",
+ imageUrl: img,
+ }
+ },
+
+
+
+
+
+ closeSpecModal: function() {
+ this.setData({
+ yijian: false
+ });
+ },
+
+ close_popup: function() {
+ this.setData({
+ showStore: true
+ });
+ },
+
+
+
+ //-- 选择门店。此时的门店选择与门店有关系 --
+ choice_store: function(ee) {
+
+ //--先判断会员状态--
+ var user_info = getApp().globalData.userInfo;
+ if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+ wx.navigateTo({
+ url: '/packageE/pages/togoin/togoin',
+ })
+ return false;
+ }
+
+ var th = this;
+ var bconfig = th.data.bconfig;
+
+ //如果开启了,则不在选择门店
+ if(this.data.sys_switch.is_pricing_open_store && getApp().globalData.pk_store){
+ return false;
+ }
+
+ if(!th.data.only_pk && !th.data.def_pickpu_list){
+ getApp().confirmBox("门店库存不足", null, 25000, !1);
+ return false;
+ }
+ if(th.data.only_pk && !th.data.only_pk.length){
+ getApp().confirmBox("门店库存不足", null, 25000, !1);
+ return false;
+ }
+ if(th.data.def_pickpu_list && !th.data.def_pickpu_list.length){
+ getApp().confirmBox("门店库存不足", null, 25000, !1);
+ return false;
+ }
+
+ if ( bconfig && bconfig.is_sort_storage) {
+ wx.getLocation({
+ type: 'gcj02',
+ success: function(res) {
+
+ th.data.lat = res.latitude;
+ th.data.lon = res.longitude;
+ th.data.is_get_local_ok = 1;
+ th.setData({
+ is_gps: 1
+ });
+ //th.onShow();
+ th.get_sto();
+ },
+ fail: function(res) {
+ //th.onShow();
+ th.data.is_get_local_ok = 1;
+ th.get_sto();
+ if (res.errCode == 2) {
+ th.setData({
+ is_gps: 0
+ });
+ if (th.data.is_gps == 0) {
+ getApp().confirmBox("请开启GPS定位", null, 25000, !1);
+ }
+ } else {
+ th.setData({
+ is_gps: "3"
+ });
+ }
+
+ }
+ })
+ }else{
+ th.data.is_get_local_ok = 1;
+ th.get_sto();
+ }
+
+ this.setData({
+ store: 1,
+ yijian: false,
+ choice_sort_store:0
+ })
+
+ },
+
+
+ //选择更多门店
+ more_store: function() {
+ this.setData({ sort_store: 1});
+ },
+
+ // 返回按钮
+ returns: function() {
+ this.setData({
+ sort_store: 0,choice_sort_store: 0
+ });
+ },
+
+
+ //-- 等待获取定位系统 --
+ wait_for_store_config: function() {
+ var th = this;
+ var t_time = setInterval(function() {
+ if (th.data.bconfig == null) false;
+ var e = th.data.bconfig;
+ if (e && e.is_sort_storage) {
+ wx.getLocation({
+ type: 'gcj02',
+ success: function(res) {
+ th.data.lat = res.latitude;
+ th.data.lon = res.longitude;
+ th.data.is_get_local_ok = 1;
+ },
+ fail: function(res) {
+ if (res.errCode == 2) {
+ th.setData({
+ is_gps: 0
+ });
+ if (th.data.is_gps == 0) {
+ getApp().confirmBox("请开启GPS定位", null, 10000, !1);
+ }
+
+ } else {
+ th.setData({
+ is_gps: "3"
+ });
+ }
+
+ th.data.is_get_local_ok = 1;
+ }
+ })
+ } else {
+ th.data.is_get_local_ok = 1;
+ }
+ clearInterval(t_time);
+ }, 500)
+ },
+
+
+ //---------拿出门店分类和门店------------
+ get_sto(e) {
+ var th = this,that=this;
+ var timer_get = setInterval(function() {
+ if (th.data.is_get_local_ok == 0) return false;
+ if (!th.data.goods) return false;
+ var dd = null,
+ i = getApp().request;
+ var g_distr_type = th.data.goods.distr_type;
+ if (g_distr_type != 0) {
+ dd = {
+ store_id: o.stoid,
+ distr_type: g_distr_type,
+ isstop: 0,
+ is_pos: 1,
+ pageSize: 2000
+ }
+ } else {
+ dd = {
+ store_id: o.stoid,
+ isstop: 0,
+ is_pos: 1,
+ pageSize: 2000
+ }
+ }
+ //如果有距离的话
+ if (th.data.lat != null) {
+ dd.lat = th.data.lat;
+ dd.lon = th.data.lon;
+ }
+ clearInterval(timer_get);
+
+ //如果会员是有默认的门店话
+ if(!th.data.def_pick_store && th.data.fir_def_store){
+ th.setData({def_pick_store:th.data.fir_def_store});
+ }
+
+ //----------获取门店----------------
+ getApp().request.promiseGet("/api/weshop/pickup/list", {
+ data: dd,
+ }).then(res => {
+ var e = res;
+ if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length>0) {
+
+ var pickup_ids=null;
+ //指定门店判断, 不是普通购买的时候,秒杀的时候,秒杀有指定门店
+ if( th.data.teamlist.pick_up_lists){
+ pickup_ids=th.data.teamlist.pick_up_lists
+ }
+
+ //-- 如果有指定门店的时候 --
+ if(pickup_ids){
+ var ok_arr=[];
+ for (let i in e.data.data.pageData) {
+ let ite = e.data.data.pageData[i];
+ //-- 查找一下门店有没有在 --
+ var idx=pickup_ids.findIndex(function (e){
+ return e.pickup_id==ite.pickup_id;
+ })
+ if(idx>-1){
+ ok_arr.push(ite)
+ }
+ }
+
+ //判断会员的默认的门店是不是匹配指定的门店
+ if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){
+ //-- 查找一下门店有没有在 --
+ var idx1=pickup_ids.findIndex(function (e){
+ return e.pickup_id==th.data.def_pick_store.pickup_id;
+ })
+
+ if(idx1<0){
+ th.data.def_pick_store.is_no_dis_act=1;
+ }else{
+ th.data.def_pick_store.is_no_dis_act=0;
+ }
+
+ that.setData({
+ def_pick_store: th.data.def_pick_store
+ })
+
+ }
+ e.data.data.pageData=ok_arr; //数组重新赋值
+ e.data.data.total=ok_arr.length; //数组的长度
+ }
+ else{
+ //-- 多规格指定门店优化 --
+ if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){
+ th.data.def_pick_store.is_no_dis_act=0;
+ that.setData({
+ def_pick_store: th.data.def_pick_store
+ })
+ }
+ }
+
+
+
+ var his_cate_num=0;
+ for(let i in e.data.data.pageData){
+ let item=e.data.data.pageData[i];
+ if(item.category_id>0){
+ his_cate_num=1;break;
+ }
+ }
+ e.his_cate_num=his_cate_num;
+
+ //如果有开启距离的功能,没有设置默认门店,要用最近的门店作为默认门店
+ if(dd.lat && !th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage){
+ th.setData({
+ def_pick_store:e.data.data.pageData[0],
+ sto_sele_name: e.data.data.pageData[0].pickup_name,
+ sto_sele_id: e.data.data.pageData[0].pickup_id,
+ sto_sele_distr: e.data.data.pageData[0].distr_type
+ });
+ th.data.fir_def_store=e.data.data.pageData[0];
+ }
+
+ //-- 如果有默认选择门店的时候,要把默认门店放在第一位 --
+ if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store)!='{}'){
+ for (var k = 0; k < e.data.data.pageData.length; k++) {
+ if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
+ e.data.data.pageData.splice(k, 1); //删除
+ break;
+ }
+ }
+ e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
+ }
+
+
+ th.setData({all_pick_list:e.data.data.pageData});
+
+
+ setTimeout(function(){
+ th.deal_pickup(e); //--普通门店排版--
+ },800)
+
+ }
+ })
+ }, 200)
+
+ },
+
+ //------------处理门店,拼团活动只有线上库存---------------
+ deal_pickup(e){
+ var th=this;
+ var g_distr_type=th.data.goods.distr_type;
+ //单总量超出5个的时候
+ if (e.data.data.total > 10 && e.his_cate_num) {
+ getApp().request.get("/api/weshop/storagecategory/page", {
+ data: {
+ store_id: o.stoid,
+ pageSize: 1000,
+ orderField:"sort",
+ orderType:'asc',
+ },
+ success: function(ee) {
+ if (ee.data.code == 0) {
+
+ var check_all_cate=0;
+ if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){
+ for(let i in ee.data.data.pageData){
+ let item=ee.data.data.pageData[i];
+ if(item.is_show==1){
+ check_all_cate=1;break
+ }
+ }
+ }
+
+
+
+ if (check_all_cate) {
+
+ var sto_cate = ee.data.data.pageData;
+ var sto_arr = e.data.data.pageData;
+ var newarr = new Array();
+ var qita = new Array();
+
+ var is_del_pk=0;
+ //----要进行门店分组--------
+ for (var i = 0; i < sto_arr.length; i++) {
+ //找一下这个门店有没有在分类数组内
+ var find2 = 0,find2name = "",sort=0;
+ is_del_pk=0;
+ for (var m = 0; m < sto_cate.length; m++) {
+ if (sto_arr[i].category_id == sto_cate[m].cat_id) {
+ if(sto_cate[m].is_show!=1){
+ is_del_pk=1; sto_arr.splice(i,1);
+ i--;
+ }else {
+ find2 = sto_cate[m].cat_id;
+ find2name = sto_cate[m].cat_name;
+ sort = sto_cate[m].sort;
+ is_del_pk=0;
+ }
+ break;
+ }
+ }
+ if(is_del_pk) continue;
+
+ if (newarr.length > 0) {
+ var find = 0;
+ //如果有找到,那门店就在这个分组内,否则,分类就要排在其他
+ if (find2 != 0) {
+ for (var ii = 0; ii < newarr.length; ii++) {
+ if (sto_arr[i].category_id == newarr[ii].cat_id) {
+ newarr[ii].s_arr.push(sto_arr[i]);
+ find = 1;
+ break;
+ }
+ }
+ if (find == 0) {
+ var arr0 = new Array();
+ arr0.push(sto_arr[i]);
+ var item = {
+ cat_id: find2,
+ name: find2name,
+ sort:sort,
+ s_arr: arr0
+ };
+ newarr.push(item);
+ }
+ } else {
+ qita.push(sto_arr[i]);
+ }
+ } else {
+ //如果有找到,那门店就在这个分组内,否则,分类就要排在其他
+ if (find2 != 0) {
+ var arr0 = new Array();
+ arr0.push(sto_arr[i]);
+ var item = {
+ cat_id: find2,
+ name: find2name,
+ sort:sort,
+ s_arr: arr0
+ };
+ newarr.push(item);
+ } else {
+ qita.push(sto_arr[i]);
+ }
+ }
+ }
+
+ var def_arr = new Array();
+ //-- 开始就看10个门店 --
+ for (var k = 0; k < 10; k++) {
+ if (k == sto_arr.length) break;
+ def_arr.push(sto_arr[k]);
+ }
+
+ th.setData({
+ def_pickpu_list: def_arr,
+ pickpu_list: ee.data.data.pageData
+ });
+
+ //门店分类要排序下
+ function compare(property){
+ return function(a,b){
+ var value1 = a[property];
+ var value2 = b[property];
+ return value1 - value2;
+ }
+ }
+ if(newarr.length>0)
+ newarr.sort(compare("sort"));
+
+
+ //----安排其他的分类-----
+ if (qita.length > 0) {
+ var item = {
+ cat_id: -1,
+ name: "其他",
+ s_arr: qita
+ };
+ newarr.push(item);
+ }
+
+ var sd={
+ all_sto: newarr,
+ is_show_sto_cat:1
+ }
+ if(!sto_arr || sto_arr.length<=10){
+ sd.is_show_sto_cat=-1;
+ sd.only_pk=sto_arr;
+ }
+ th.setData(sd);
+
+ } else {
+ th.setData({
+ is_show_sto_cat: -1,
+ only_pk: e.data.data.pageData
+ });
+ //-----如果没有默认门店,要取第一个门店作为默认店.此时没有门店分类的情况------
+ if (!th.data.def_pick_store) {
+ th.setData({def_pick_store:e.data.data.pageData[0]})
+ }
+ }
+ } else {
+ th.setData({
+ is_show_sto_cat: -1,
+ only_pk: e.data.data.pageData
+ });
+ //-----如果没有默认门店,要取第一个门店作为默认店.此时没有门店分类的情况------
+ if (!th.data.def_pick_store) {
+ th.setData({def_pick_store:e.data.data.pageData[0]})
+ }
+
+ }
+ }
+ });
+ } else {
+ th.setData({
+ is_show_sto_cat: 0,
+ only_pk: e.data.data.pageData
+ });
+ //-----如果没有默认门店,要取第一个门店作为默认店------
+ if (!th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage) {
+ th.setData({
+ def_pick_store:e.data.data.pageData[0],
+ sto_sele_name: e.data.data.pageData[0].pickup_name,
+ sto_sele_id: e.data.data.pageData[0].pickup_id,
+ sto_sele_distr: e.data.data.pageData[0].distr_type
+ })
+ }
+ }
+ },
+
+
+
+ //---选择分类门店---
+ choice_sort_store: function(e) {
+ var index = e.currentTarget.dataset.index;
+ var region_name = e.currentTarget.dataset.region;
+ var item = this.data.all_sto[index];
+ this.setData({
+ region_name: region_name,
+ sort_store: 0,
+ choice_sort_store: 1,
+ sec_sto: item,
+ sec_pick_index: 0,
+ });
+ },
+
+ choose_for_store_fir: function(e) {
+ var index_c = e.currentTarget.dataset.ind;
+ var th=this;
+ th.setData({
+ fir_pick_index: index_c
+ })
+ },
+
+ //---点击二级之后的选择---
+ choose_for_store: function(e) {
+ var index_c = e.currentTarget.dataset.ind;
+ var th=this;
+ th.setData({
+ sec_pick_index: index_c,
+ fir_pick_index: index_c
+ })
+
+ },
+
+ //确定def_pick为选择的门店
+ sure_pick: function(e) {
+ var th = this;
+ var item = null;
+
+ if (th.data.choice_sort_store == 0) {
+ var index = th.data.fir_pick_index;
+ if (th.data.is_show_sto_cat == 1) {
+ item = th.data.def_pickpu_list[index];
+ } else {
+ item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候
+ }
+
+ } else {
+ var index = th.data.sec_pick_index;
+ item = th.data.sec_sto.s_arr[index];
+ }
+ if(!item) return false;
+
+
+ th.setData({
+ def_pick_store: item,
+ sto_sele_name: item.pickup_name,
+ sto_sele_id: item.pickup_id,
+ sto_sele_distr: item.distr_type,
+ store: 0,
+ choice_sort_store: 0,
+ fir_pick_index: 0
+ });
+
+
+ th.setData({
+ yijian: 1, //打开拼团购买界面
+ store: 0, //关闭门店
+ choice_sort_store: 0, //关闭门店2级
+ sort_store: 0, //关闭门店2级
+ });
+
+
+ },
+
+
+
+ //把选择的门店设置成默认的门店def_pick
+ set_def_pick: function(e) {
+ var th = this;
+ var item = null;
+ if (th.data.choice_sort_store == 0) {
+ var index = th.data.fir_pick_index;
+ if (th.data.is_show_sto_cat == 1) {
+ item = th.data.def_pickpu_list[index];
+ } else {
+ item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候
+ }
+ } else {
+ var index = th.data.sec_pick_index;
+ item = th.data.sec_sto.s_arr[index];
+ }
+
+ if(!item) return false;
+
+
+ var store_id = o.stoid;
+ var user_id = getApp().globalData.user_id;
+ var def_pickup_id = item.pickup_id;
+
+ getApp().request.put('/api/weshop/users/update', {
+ data: {
+ user_id,
+ def_pickup_id
+ },
+ success: function(res) {
+ if (res.data.code == 0) {
+ if (th.data.choice_sort_store == 0) th.setData({
+ fir_pick_index: 0
+ });
+ getApp().globalData.pk_store = item;
+ } else {
+ getApp().my_warnning("设置默认门店地址失败",0,th)
+ }
+
+ }
+ });
+
+ th.setData({
+ def_pick_store: item,
+ sto_sele_name: item.pickup_name,
+ sto_sele_id: item.pickup_id,
+ sto_sele_distr: item.distr_type,
+ store: 0,
+ choice_sort_store: 0
+ });
+
+ //4就是拼团
+ th.setData({
+ yijian: 1, //打开拼团购买界面
+ store: 0, //关闭门店
+ choice_sort_store: 0, //关闭门店2级
+ sort_store: 0, //关闭门店2级
+ });
+
+ },
+
+
+ //-- 关闭选择门店 --
+ close_popup: function(e) {
+ var th=this;
+ this.setData({
+ store: 0,
+ choice_sort_store: 0,
+ sort_store: 0,
+ fir_pick_index:0,
+ sec_pick_index:0,
+ yijian: 1, //打开拼团购买界面
+ })
+
+ },
+
+ //-- 弹出框的同意的优化,重新获取定位 ---
+ agree_pri:function (){
+ var th=this;
+ var bconfig = th.data.bconfig;
+ if (bconfig && bconfig.is_sort_storage) {
+ wx.getLocation({
+ type: 'gcj02',
+ success: function (res) {
+ th.data.lat = res.latitude;
+ th.data.lon = res.longitude;
+ th.data.is_get_local_ok = 1;
+ th.setData({
+ is_gps: 1
+ });
+ //th.onShow();
+ th.get_sto();
+ },
+ fail: function (res) {
+ //th.onShow();
+ th.data.is_get_local_ok = 1;
+ th.get_sto();
+ if (res.errCode == 2) {
+ th.setData({
+ is_gps: 0
+ });
+ if (th.data.is_gps == 0) {
+ getApp().confirmBox("请开启GPS定位", null, 25000, !1);
+ }
+ } else {
+ th.setData({
+ is_gps: "3"
+ });
+ }
+
+ }
+ })
+ }
+ },
+
+
+
+
+})
\ No newline at end of file
diff --git a/packageG/pages/team/team_show/team_show.json b/packageG/pages/team/team_show/team_show.json
new file mode 100644
index 0000000..199474a
--- /dev/null
+++ b/packageG/pages/team/team_show/team_show.json
@@ -0,0 +1,13 @@
+{
+ "windom": {
+ "navigationBarTitleText": "拼团订单",
+ "backgroundTextStyle": "light",
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#ffffff",
+ "backgroundColor": "#eeeeee"
+ },
+ "usingComponents": {
+ "warn": "/components/long_warn/long_warn",
+ "privacy_pop": "/components/privacy_pop/privacy_pop"
+ }
+}
\ No newline at end of file
diff --git a/packageG/pages/team/team_show/team_show.wxml b/packageG/pages/team/team_show/team_show.wxml
new file mode 100644
index 0000000..698ec4e
--- /dev/null
+++ b/packageG/pages/team/team_show/team_show.wxml
@@ -0,0 +1,550 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{goods.goods_name}}
+
+
+
+
+
+ ¥{{teamlist.price}}
+
+ ¥{{goods.shop_price}}
+
+
+
+
+ 已拼{{teamlist.buy_num}}件
+
+
+
+
+
+ {{teamlist.ct_num}}人拼
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 拼团成功,为您节省25元
+
+
+
+
+
+
+ 拼团失败
+
+
+
+
+
+
+
+
+
+ 团长
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 剩余
+ {{obj.day}} :
+ {{obj.hou}} :
+ {{obj.min}} :
+ {{obj.sec}} 结束
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 去参团
+ 返回首页
+
+
+ 一键参团
+ 返回首页
+
+
+ 一键参团
+ 返回首页
+
+
+
+
+ 会员'{{tg_arr.user_name}}'待付款,若{{r_obj.min}}分{{r_obj.sec}}秒后该会员未支付您可以继续参团哦!
+
+
+
+ 去参团
+ 返回首页
+
+
+
+
+
+
+
+
+
+ 展开拼团列表
+
+
+
+
+
+
+ 收起拼团列表
+
+
+
+
+
+
+ {{item.nickname}}
+
+ {{item.add_time_date}} 开团
+ {{item.add_time_date}} 参团
+
+
+
+
+
+
+
+
+
+ 大家都在团
+
+
+
+
+
+
+
+
+ {{item.goods_name}}
+
+
+ ¥{{item.price}}
+ {{item.ct_num}}人
+ 参团
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{goods.goods_name}}
+
+
+ ¥{{teamlist.kttype==3?teamlist.yf_price:teamlist.price}}
+
+
+
+ 已售:{{teamlist.buy_num}}
+ 可售:{{teamlist.goods_num-teamlist.buy_num}}
+
+
+
+
+
+
+
+
+
+ {{def_pick_store.pickup_name}}
+
+
+ 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
+
+
+
+
+
+
+ 选择门店
+
+
+ 更多门店
+
+
+
+ (配送不匹配)
+ (该店不可售)
+ 地址:{{def_pick_store.fulladdress}}
+
+
+
+
+ 商品规格
+
+
+ {{goods.gg}}
+
+
+
+
+
+
+
+
+ 购买数量
+
+ -
+
+ 1
+ +
+
+
+
+
+
+
+
+
+
+ 配送不匹配
+ 该店不可售
+ 确定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{toastText}}
+
+
+
+
+
+
+
+
+
+
+ 拼团玩法介绍
+
+
+ 1.开团:
+ 选择心仪商品,点击“发起X人团”按钮,付款后即为开团成功;
+
+ 2.参团:
+ 进入朋友分享的页面,点击“立即参团”按钮,付款后即为参团成功,若多人同时支付,支付成功时间较早的人获得参团资格;
+
+ 3.成团:
+ 在开团或参团成功后,点击“邀请小伙伴参团”将页面分享给好友,在有效时间内凑齐人数即为成团,此时商家会开始发货;
+
+ 4.组团失败:
+ 在有效时间内未凑齐人数,即为组团失败,此时付款项会原路退回到支付账户;
+
+ 5.
+ 组团有效期间内,拼购商品订单不允许取消。
+
+
+
+
+
+
diff --git a/packageG/pages/team/team_show/team_show.wxss b/packageG/pages/team/team_show/team_show.wxss
new file mode 100644
index 0000000..cbff3ff
--- /dev/null
+++ b/packageG/pages/team/team_show/team_show.wxss
@@ -0,0 +1,2201 @@
+page {
+ background-color: #eee;
+}
+
+.top {
+ background-color: rgb(216, 230, 220);
+ color: rgb(98, 155, 13);
+ text-align: center;
+ height: 110rpx;
+ width: 100%;
+}
+
+.center {
+ height: 240rpx;
+ width: 100%;
+ background: #fff;
+}
+
+.cenleft {
+ width: 240rpx;
+ height: 100%;
+ float: left;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.cenleft image {
+ background-color: white;
+ width: 200rpx;
+ height: 200rpx;
+}
+
+.cenrt {}
+
+.cenright {
+ height: 100%;
+ width: auto;
+ float: left;
+}
+
+.cenrtoptitle {
+ float: left;
+ width: 240rpx;
+ height: 40rpx;
+ margin-left: 12rpx;
+ font-size: 28rpx;
+ margin-top: 12rpx;
+}
+
+.cenrcen {
+ height: 70rpx;
+ margin-top: 35rpx;
+ width: 479rpx;
+}
+
+.jg {
+ font-size: 40rpx;
+ margin-right: 30rpx;
+}
+
+.jgx {
+ font-size: 24rpx;
+ color: #777;
+ text-decoration: line-through;
+ margin-top: 12rpx;
+}
+
+.cenrfoot {
+ align-content: center;
+ text-align: center;
+ border: 2rpx solid red;
+ border-radius: 10rpx;
+ color: red;
+ float: left;
+ font-size: 24rpx;
+ padding: 4rpx 16rpx;
+ margin-top: 12rpx;
+}
+
+.body {
+ background-color: white;
+ height: 472rpx;
+ width: 100%;
+ margin-top: 4rpx;
+}
+
+.d {
+ font-size: 24rpx;
+}
+
+.bodytop {
+ background-color: white;
+ text-align: center;
+ font-size: 28rpx;
+ padding-top: 16rpx;
+ height: 90rpx;
+
+}
+
+.bodytop span {
+ color: red;
+}
+
+.bodyimg {
+ height: 155rpx;
+ /* display: flex;
+ justify-content: center;
+ align-items: center; */
+
+
+}
+
+.bodyimg image {
+ border-radius: 50rpx;
+ height: 96rpx;
+ width: 96rpx;
+ margin-top: 30rpx;
+ position: absolute;
+
+}
+
+.d {
+ width: 101rpx;
+ height: 101rpx;
+ display: inline-block;
+
+}
+
+.bodyimg span {
+ background-color: #e22b44;
+ color: white;
+ font-size: 24rpx;
+ border-radius: 6rpx;
+ padding: 3rpx 10rpx;
+ position: relative;
+ top: 8px;
+ left: 40rpx;
+}
+
+.bodyspan {
+ color: red;
+ text-align: center;
+ font-size: 24rpx;
+}
+
+.bodytime {
+ height: 55rpx;
+ width: 100%;
+ display: flex;
+ flex-wrap: nowrap;
+ padding-left: 40rpx;
+ align-items: center;
+
+}
+
+.bodytimeleft {
+ text-decoration: line-through;
+ flex-grow: 1.7;
+}
+
+.bodytimecen {
+ text-align: center;
+ flex-grow: 1;
+
+ font-size: 30rpx;
+ color: #000;
+ width: 415rpx;
+
+}
+
+.bodytimecen span {
+ background-color: #333333;
+ color: white;
+ border-radius: 7rpx;
+ padding-left: 20rpx;
+ font-size: 30rpx;
+ margin: 0 auto;
+ padding-right: 10rpx;
+ margin-right: 5px;
+
+
+}
+
+.bodytimecen span:last-child {
+ margin-right: 10rpx;
+
+}
+
+.bodytimeright {
+ flex-grow: 1.7;
+ margin-right: 72rpx;
+
+}
+
+.bodybutton {
+ min-height: 170rpx;
+ width: 90%;
+ margin: 0 auto;
+ text-align: center;
+ line-height: 70rpx;
+ border-radius: 15rpx;
+ height: auto;
+ padding-top: 38rpx
+}
+
+.bodybutton button {
+ height: 100%;
+ width: 100%;
+ background-color: red;
+ color: white;
+ font-size: 32rpx;
+}
+
+.bodybutton.co-w {
+ color: #333;
+ background-color: #adadad;
+ font-size: 32rpx;
+
+}
+
+
+
+.bodyfoot {
+ width: 100%;
+ text-align: center;
+ font-size: 28rpx;
+ color: #777;
+ background-color: white;
+}
+
+.pintuan {
+ width: 100%;
+ height: 84rpx;
+ background-color: white;
+ color: black;
+ text-align: center;
+ font-size: 36rpx;
+ margin-top: 0rpx;
+}
+
+
+.pintuanzhou {
+ float: left;
+ line-height: 84rpx;
+ width: 226rpx;
+ background: url('https://mshopimg.yolipai.net/miniapp/images/user/wh.png') no-repeat right center;
+ background-size: 42rpx;
+ margin-left: -18rpx;
+ font-size: 32rpx;
+}
+
+.pintuanyou {
+ float: right;
+ color: rgb(168, 167, 167);
+ line-height: 84rpx;
+ font-size: 32rpx;
+ margin-right: 24rpx;
+}
+
+.onegoods {
+ background-color: white;
+ width: 372rpx;
+ height: 560rpx;
+ border-left: 2rpx solid #eee;
+ float: left;
+}
+
+.goodsl {
+ background-color: white;
+}
+
+.onegoodsimg {
+ width: 100%;
+ height: 360rpx;
+ margin-bottom: 20rpx;
+}
+
+.onegoodsimg image {
+ height: 100%;
+ width: 100%;
+}
+
+.onegoodsdesc {
+ color: rgb(168, 167, 167);
+ padding-left: 20rpx;
+ height: 100rpx;
+ font-size: 32rpx;
+ width: 92%;
+ line-height: 100rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ padding-right: 20rpx;
+}
+
+.onegoodsdesc text {}
+
+.price {
+ color: red;
+ width: 100%;
+}
+
+.jgleft {
+ float: left;
+ width: 100rpx;
+ margin-left: 20rpx;
+ font-size: 40rpx;
+ margin-top: -8rpx;
+}
+
+.jgright {
+ font-size: 28rpx;
+ float: right;
+ width: 120rpx;
+}
+
+.jgright span {
+ color: rgb(168, 167, 167);
+}
+
+.goodslisttop {
+ background-color: white;
+ width: 100%;
+}
+
+.goodslist {
+ background-color: white;
+}
+
+.goodslisttop {
+ background-color: white;
+ width: 100%;
+ height: 80rpx;
+ margin-top: 20rpx;
+ text-align: center;
+}
+
+.goodslistspan {
+ margin: 0 auto;
+ padding-top: 20rpx;
+ display: inline-block;
+ padding: 0 10px;
+ background: #fff;
+ margin-top: 12rpx;
+ font-size: 28rpx;
+ color: rgb(168, 167, 167);
+}
+
+.xian {
+ height: 50%;
+ width: 100%;
+ border-bottom: 4rpx solid #eee;
+ float: left;
+}
+
+.bodyselect {
+ height: 50px;
+ background-color: white;
+ width: 100%;
+ line-height: 50px;
+ font-size: 28rpx;
+}
+
+.changxin {
+ float: left;
+ width: 100%;
+}
+
+.zhangxi {
+ width: 100%;
+ min-height: 100rpx;
+ background-color: white;
+ color: black;
+}
+
+.img {
+ width: 30%;
+ height: 100rpx;
+ margin-bottom: 0rpx;
+ color: black;
+ margin-left: 36rpx;
+ font-size: 26rpx;
+ display: flex;
+}
+
+.img span {
+ height: 100rpx;
+ display: block;
+ line-height: 100rpx;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ overflow: hidden;
+ padding: 0rpx;
+ width: 120rpx;
+}
+
+.zhangxi image {
+ border-radius: 50rpx;
+ height: 80rpx;
+ width: 80rpx;
+ float: left;
+ margin-top: 12rpx;
+ background-color: red;
+ margin-right: 10rpx;
+}
+
+.zhangxi .zssj {
+ height: 100rpx;
+ width: 70%;
+ margin-right: 40rpx;
+ line-height: 100rpx;
+ font-size: 26rpx;
+ text-align: right;
+}
+
+.zhangxi .zssj text {
+ width: 100%;
+}
+
+.ia {
+ display: flex;
+}
+
+.zspan {
+ text-align: center;
+ border-bottom: 2rpx #eee solid;
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 28rpx;
+ color: #777;
+ line-height: 100rpx;
+ height: auto;
+
+}
+
+.mtop {
+ text-align: center;
+ color: white;
+ background-color: #4c4c4c;
+ width: 100%;
+ height: 100%;
+ position: fixed;
+ z-index: 5;
+ top: 0;
+ left: 0;
+}
+
+.mt1 {
+ margin-top: 100px;
+ margin-bottom: 20rpx;
+}
+
+.mts {
+ color: #e1e10b;
+}
+
+.mcou {
+ font-size: 48rpx;
+}
+
+.mfoot {
+ width: 100%;
+ margin-top: 700rpx;
+}
+
+.mbtn {
+ margin-top: 60rpx;
+ width: 400rpx;
+ background: #666;
+ color: #fff;
+ border-radius: 20rpx;
+ font-size: 32rpx;
+}
+
+.etop {
+ padding-top: 200rpx;
+ width: 100%;
+ height: 100%;
+ position: fixed;
+ left: 0rpx;
+ top: 0rpx;
+ z-index: 12rpx;
+ background-color: white;
+}
+
+.emyimage {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.emyimage image {
+ background-color: red;
+ width: 160rpx;
+ height: 160rpx;
+ margin: 0 auto;
+}
+
+.espan {
+ font-size: 32rpx;
+ margin-top: 10rpx;
+}
+
+.erweima {
+ margin-top: 10rpx;
+ width: 100%;
+}
+
+.erzhou {
+ width: 200rpx;
+ float: left;
+ margin-right: 20rpx;
+}
+
+.erzhou image {
+ background-color: blanchedalmond;
+ width: 200rpx;
+ height: 200rpx;
+}
+
+.eright {
+ width: 500rpx;
+ float: left;
+ font-size: 32rpx;
+}
+
+.body {
+ background-color: white;
+ height: auto;
+ width: 100%;
+ margin-top: 4rpx;
+}
+
+.cenrtoptitle {
+ float: left;
+ width: 450rpx;
+ font-size: 28rpx;
+ margin-top: 20rpx;
+
+}
+
+.cenrtop {
+ margin-top: 20rpx;
+ background-color: red;
+ color: white;
+ border-radius: 10rpx;
+ padding: 0 16rpx;
+ font-size: 28rpx;
+ float: left;
+ height: 40rpx;
+}
+
+.yijian {
+ position: fixed;
+ top: 0rpx;
+ left: 0rpx;
+ width: 100%;
+ height: 100%;
+ z-index: 14rpx;
+ background-color: rgba(0, 0, 0, 0.3);
+}
+
+.buy-option {
+ background: #fff;
+ box-shadow: 0 0 6px rgba(0, 0, 0, 0.5);
+ padding: 20rpx;
+ min-height: 400rpx;
+ padding-bottom: 120rpx;
+ width: 100%;
+ margin-top: 180rpx;
+}
+
+.buy-top {
+ width: 100%;
+}
+
+.buy-image {
+ margin-right: 20rpx;
+ width: 320rpx;
+ height: 200rpx;
+ float: left;
+}
+
+.buy-image image {
+ width: 200rpx;
+ height: 200rpx;
+ background-color: burlywood;
+ float: left;
+}
+
+.buy-image text {
+ margin-left: 10rpx;
+ color: red;
+}
+
+.buy-cou {
+ float: right;
+ width: 100rpx;
+ height: 200rpx;
+ background-color: white;
+ font-size: 60rpx;
+ color: black;
+}
+
+.t1 {
+ float: left;
+ font-size: 28rpx;
+ padding-left: 4rpx;
+ color: red;
+ padding-top: 10rpx;
+}
+
+.buy-button {
+ width: 100%;
+ float: left;
+ margin-top: 22rpx;
+}
+
+.buy-button text {
+ float: left;
+}
+
+.stepper {
+ height: 52rpx;
+ float: left;
+ border: 2rpx solid #ccc;
+ border-radius: 6rpx;
+ margin-left: 28rpx;
+}
+
+/*加号和减号*/
+
+.stepper text {
+ float: left;
+ width: 76rpx;
+ line-height: 52rpx;
+ text-align: center;
+}
+
+/*数值*/
+
+.stepper input {
+ width: 80rpx;
+ height: 52rpx;
+ float: left;
+ margin: 0 auto;
+ text-align: center;
+ font-size: 24rpx;
+ border-left: 2rpx solid #ccc;
+ border-right: 2rpx solid #ccc;
+}
+
+/*普通样式*/
+
+.stepper .normal {
+ color: black;
+}
+
+/*禁用样式*/
+
+.stepper .disable {
+ color: #ccc;
+}
+
+.quhuo {
+ width: 100%;
+ color: rgb(51, 51, 51);
+ float: left;
+ margin-top: 20rpx;
+}
+
+.x-z {
+ width: 100%;
+ float: left;
+ color: rgb(51, 51, 51);
+ font-size: 36rpx;
+}
+
+.btn {
+ width: 94%;
+ background-color: red;
+ color: white;
+ text-align: center;
+ height: 88rpx;
+ line-height: 88rpx;
+ float: left;
+ margin: 0 auto;
+}
+
+.mck {
+ min-height: 100rpx;
+ width: 100%;
+ border-bottom: 24rpx #eee solid;
+}
+
+/* pages/yi/yi.wxss */
+
+.buy-option {
+ background: #fff;
+ padding: 20rpx;
+ margin-top: 650rpx;
+ width: 100%;
+}
+
+.buy-top {
+ width: 100%;
+}
+
+.buy-image {
+ margin-right: 20rpx;
+ width: 630rpx;
+ height: 200rpx;
+ float: left;
+}
+
+.buy-image image {
+ width: 200rpx;
+ height: 200rpx;
+ background-color: burlywood;
+ float: left;
+ margin-right: 16rpx;
+}
+
+
+.buy-image text {
+ margin-left: 10rpx;
+ color: red;
+}
+
+.buy-cou {
+ float: right;
+ width: 60rpx;
+ height: 60rpx;
+ background-color: white;
+ font-size: 60rpx;
+ color: black;
+ margin-right: 40rpx;
+ text-align: center;
+ line-height: 60rpx;
+ padding-bottom: 4rpx;
+}
+
+.t1 {
+ font-size: 28rpx;
+ padding-left: 4rpx;
+ color: red;
+ padding-top: 10rpx;
+}
+
+.buy-button {
+ width: 100%;
+ margin-top: 30rpx;
+}
+
+.buy-button text {
+ /*float: left;*/
+ display: inline-block;
+}
+
+.stepper {
+ height: 52rpx;
+ display: inline-block;
+ border: 2rpx solid #ccc;
+ border-radius: 6rpx;
+ margin-left: 28rpx;
+}
+
+/*加号和减号*/
+
+.stepper text {
+ float: left;
+ width: 65rpx;
+ line-height: 52rpx;
+ text-align: center;
+}
+
+/*数值*/
+
+.stepper input {
+ width: 84rpx;
+ height: 52rpx;
+ float: left;
+ margin: 0 auto;
+ text-align: center;
+ font-size: 24rpx;
+ border-left: 2rpx solid #ccc;
+ border-right: 2rpx solid #ccc;
+}
+
+/*普通样式*/
+
+.stepper .normal {
+ color: black;
+}
+
+/*禁用样式*/
+
+.stepper .disable {
+ color: #ccc;
+}
+
+.quhuo {
+ width: 100%;
+ color: rgb(51, 51, 51);
+ margin-top: 45rpx;
+ font-size: 32rpx
+}
+
+.quhuo image {
+ width: 40rpx;
+ height: 40rpx;
+ display: inline-block;
+ position: relative;
+ left: 500rpx;
+}
+
+.ttxz {
+ display: inline-block;
+}
+
+.xuanze {
+ width: 100%;
+ height: 80rpx;
+ display: inline-block;
+ border-bottom: 1rpx #e7e7e7 solid;
+ font-size: 32rpx;
+ line-height: 80rpx;
+}
+
+.xuanze1 {
+ width: 100%;
+ color: rgb(51, 51, 51);
+ height: 80rpx;
+ display: inline-block;
+ border-bottom: 1rpx #e7e7e7 solid;
+ line-height: 80rpx;
+ overflow: hidden;
+}
+
+.x-z {
+ width: 100%;
+ color: rgb(51, 51, 51);
+ font-size: 36rpx;
+ height: auto;
+}
+
+.btn {
+ width: 100%;
+ background-color: red;
+ color: white;
+ text-align: center;
+ height: 88rpx;
+ line-height: 88rpx;
+}
+
+.clear {
+ clear: both;
+}
+
+.fir_view {
+ max-height: 300rpx;
+ overflow-y: scroll;
+}
+
+.pop_up {
+ min-height: 200rpx;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ background-color: rgba(0, 0, 0, 0.3);
+ font-size: 34rpx;
+ color: rgb(51, 51, 51);
+
+}
+
+.end_name {
+ display: inline-block;
+}
+
+/*mask*/
+
+.toast_mask {
+ opacity: 0;
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ position: fixed;
+ top: 0rpx;
+ left: 0rpx;
+ z-index: 888;
+}
+
+/*toast*/
+
+.toast_content_box {
+ display: flex;
+ width: 100%;
+ height: 100%;
+ justify-content: center;
+ align-items: center;
+ position: fixed;
+ z-index: 999;
+ top: 0rpx;
+}
+
+.toast_content {
+ width: 50%;
+ padding: 20rpx;
+ background: rgba(0, 0, 0, 0.5);
+ border-radius: 20rpx;
+}
+
+.toast_content_text {
+ height: 100%;
+ width: 100%;
+ color: #fff;
+ font-size: 28rpx;
+ text-align: center;
+}
+
+.jt {
+ width: 30rpx;
+ height: 30rpx;
+ display: inline-block;
+}
+
+.jiajian {
+ color: #999;
+}
+
+.t_wz {
+ line-height: 110rpx;
+ height: 110rpx;
+ font-size: 36rpx;
+}
+
+.down-arrow {
+ display: inline-block;
+ position: relative;
+ width: 40rpx;
+ height: 30rpx;
+ margin-right: 20rpx;
+}
+
+.down-arrow::after {
+ display: inline-block;
+ content: " ";
+ height: 18rpx;
+ width: 18rpx;
+ border-width: 0 2rpx 2rpx 0;
+ border-color: #999;
+ border-style: solid;
+ transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
+ transform-origin: center;
+ transition: transform 0.3s;
+ position: absolute;
+ top: 50%;
+ right: 10rpx;
+ margin-top: -10rpx;
+}
+
+.down-arrow1 {
+ display: inline-block;
+ position: relative;
+ width: 40rpx;
+ height: 30rpx;
+ margin-right: 20rpx;
+ margin-top: 12rpx;
+}
+
+.down-arrow1::after {
+ display: inline-block;
+ content: " ";
+ height: 18rpx;
+ width: 18rpx;
+ border-width: 0 2rpx 2rpx 0;
+ border-color: #999;
+ border-style: solid;
+ transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
+ transform-origin: center;
+ transition: transform 0.3s;
+ position: absolute;
+ top: 50%;
+ right: 10rpx;
+ margin-top: -10rpx;
+}
+
+.down-arrow1::after {
+ transform-origin: center;
+ transform: rotate(-135deg);
+ transition: transform 0.3s;
+}
+
+.goodslisttop::after {
+ content: "";
+ width: 100%;
+ height: 1px;
+ border-bottom: 1px #d4d4d4 solid;
+ display: block;
+ margin-top: -12px;
+}
+
+.ia {
+ display: flex;
+ width: 100%;
+}
+
+.bview {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0, 0, 0, 0.5);
+}
+
+.juzhong {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+ align-items: center;
+}
+
+.juzhong .xq {
+ padding: 0 20rpx;
+ background: #fff;
+ font-size: 30rpx;
+ padding-bottom: 20rpx;
+}
+
+.juzhong .xq .title {
+ text-align: center;
+ margin: 20rpx 0;
+ position: relative;
+ height: 50rpx;
+}
+
+.juzhong .xq .hs1 {
+ font-size: 28rpx;
+ color: #ab8f9e;
+}
+
+.juzhong .xq .title .close {
+ position: absolute;
+ top: 0;
+ right: 0;
+ width: 45rpx;
+ height: 45rpx;
+}
+
+/* .pt_qd {
+ margin-top: 40rpx;
+ height: auto;
+} */
+
+.spec-cart-btn.w100 {
+ width: 100%;
+ margin-left: 0;
+ height: 80rpx;
+ line-height: 80rpx;
+}
+
+
+.bview {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0, 0, 0, 0.5);
+}
+
+.juzhong {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+ align-items: center;
+}
+
+.juzhong .xq {
+ padding: 0 20rpx;
+ background: #fff;
+ font-size: 30rpx;
+ padding-bottom: 20rpx;
+}
+
+.juzhong .xq .title {
+ text-align: center;
+ margin: 20rpx 0;
+ position: relative;
+ height: 50rpx;
+}
+
+.juzhong .xq .hs1 {
+ font-size: 28rpx;
+ color: #ab8f9e;
+}
+
+.juzhong .xq .title .close {
+ position: absolute;
+ top: 0;
+ right: 0;
+ width: 45rpx;
+ height: 45rpx;
+}
+
+.pt_qd {
+ /* margin-top: 40rpx;
+ height: auto; */
+ padding: 20rpx;
+}
+
+.spec-cart-btn.w100 {
+ width: 100%;
+ margin-left: 0;
+ height: 80rpx;
+ line-height: 80rpx;
+}
+
+.show_zf_dd {
+ display: flex;
+ padding: 15rpx 40rpx;
+ justify-content: space-between;
+ font-size: 30rpx;
+ color: #666;
+}
+
+.flex_tou {
+ display: flex;
+ justify-content: center;
+ width: 100%;
+ height: 175rpx;
+ align-items: center;
+}
+
+.xc-goods-details {
+ width: 479rpx;
+ margin-top: 20rpx;
+ height: 80rpx;
+ align-items: center;
+
+}
+
+.xc-valframe {
+ border-radius: 7rpx;
+ border: 1rpx solid;
+ margin-top: 3rpx;
+}
+
+.xc-valframe .xc-frame-img {
+ width: 30rpx;
+ height: 100%;
+ background: #e22b44;
+}
+
+.xc-valframe .xc-frame-img .picture {
+ width: 25rpx;
+ height: 25rpx;
+ margin-top: 4rpx;
+
+}
+
+.bodybutton .xc-good-friend {
+ background: #fab55a;
+ border-radius: 15rpx;
+}
+
+.bodybutton .xc-home-page {
+ margin-top: 20rpx;
+ background-color: #e22b44;
+ border-radius: 15rpx;
+}
+
+.xc-ellipsis-img {
+ width: 56rpx;
+ height: 56rpx;
+ padding-top: 15rpx;
+}
+
+.xc-ptcomplete {
+ width: 74%;
+ height: 105rpx;
+ line-height: 105rpx;
+ float: right;
+
+}
+
+.xc-ptcomplete .xc-img-frame .img {
+ width: 105rpx;
+ height: 105rpx;
+ float: right;
+}
+
+.xc-ptcomplete .xc-img-frame {
+ width: 205rpx;
+ height: 105rpx;
+ margin-top: 20rpx;
+}
+
+.xc-ptcomplete .xc-end {
+ width: 283rpx;
+ text-align: right;
+}
+
+.iw {
+ padding-right: 33rpx;
+}
+
+.xc-ptcomplete .xc-img-frames {
+ width: 345rpx;
+ height: 105rpx;
+ margin-top: 20rpx;
+
+}
+
+.xc-ptcomplete .xc-img-frames .img {
+ width: 105rpx;
+ height: 105rpx;
+ float: right;
+}
+
+.bodybutton .xc-good-friend.co-w {
+ background-color: #aeaeae
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+.spec-model {
+ position: fixed;
+ bottom: 0;
+ z-index: 20;
+ background: white;
+ width: 100%;
+ /* padding: 0 30rpx; */
+ font-size: 32rpx;
+ box-sizing: border-box;
+ border-radius: 20rpx;
+ /* height: 72%; */
+}
+
+.spec-model .pding {
+ padding: 0 30rpx;
+}
+
+.spec-goods {
+ padding: 30rpx 0 20rpx;
+ float: left;
+ width: 100%;
+ border-bottom: 2rpx solid #eee;
+}
+
+.spec-img {
+ float: left;
+ height: 186rpx;
+ width: 186rpx;
+ border: 4rpx solid #eee
+}
+
+.spec-goods-info {
+ float: left;
+ padding: 0 25rpx;
+ width: 400rpx;
+}
+
+.spec-goods-name {
+ font-size: 30rpx;
+ line-height: 35rpx;
+ height: 70rpx;
+ margin: 15rpx 20rpx 25rpx 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ color: #333;
+}
+
+.spec-goods-price {
+ color: #d60021;
+ font-size: 33rpx;
+ font-weight: bold;
+}
+
+.spec-goods-stock {
+ margin-top: 3rpx;
+ font-size: 24rpx;
+ color: #999999;
+ margin-right: 15rpx;
+}
+
+.spec-name {
+ clear: both;
+ padding: 20rpx 0;
+ font-size: 30rpx;
+ color: #333;
+}
+
+.quhuo {
+ font-size: 30rpx;
+ color: #000
+}
+
+.b_num {
+ display: flex;
+ font-size: 30rpx;
+ color: #333;
+ justify-content: space-between;
+}
+
+.count {
+ /* position: fixed; */
+ display: flex;
+ height: 50rpx;
+ /* border: 1rpx solid #000; */
+ font-size: 28rpx;
+ /* right: 30rpx; */
+ /* justify-content: space-between; */
+}
+
+
+.count>view,
+.count>input {
+ width: 60rpx;
+ height: 50rpx;
+ line-height: 50rpx;
+ text-align: center;
+}
+
+.spec_bt {
+ background: fff;
+ color: #333;
+ margin-left: 10rpx;
+ padding: 4rpx 15rpx 4rpx;
+ display: inline-block;
+ border-radius: 30rpx;
+ font-size: 24rpx;
+ border: 1rpx solid #ccc;
+ margin: 10rpx;
+ height: 40rpx;
+ line-height: 40rpx;
+}
+
+.spec_bt.act {
+ background: #d60021;
+ color: #fff;
+ border: 1rpx solid #d60021;
+}
+
+.sub, .add, .count>input {
+ /* border-right: 1px solid #000; */
+ background-color: #f8f8f8;
+ border-radius: 8rpx;
+}
+.sub.active {
+ /* background-color: #ddd; */
+ color: #ccc;
+}
+.count>input {
+ margin: 0 10rpx;
+ line-height: normal;
+}
+
+/* .sub {
+ border-right: 1px solid #000;
+}
+
+.add {
+ border-left: 1px solid #000;
+} */
+
+.spec-btn {
+ color: black;
+ background-color: white;
+ padding: 10rpx 10rpx;
+ font-size: 26rpx;
+ line-height: 28rpx;
+ float: left;
+ border: 1rpx solid #dedede;
+ margin: 4rpx 10rpx 4rpx 0;
+ border-radius: 4rpx;
+}
+
+.spec-btn-click {
+ color: white;
+ background-color: #f23030;
+ border: 1rpx solid #f23030;
+}
+
+.spec-cart-btns {
+ width: 92%;
+ line-height: 70rpx;
+ margin: 0rpx auto;
+ margin-top: 160rpx;
+ border-radius: 20rpx;
+ position: fixed;
+ bottom: 50rpx;
+ left: 4%;
+
+}
+
+.spec-cart-btn {
+
+ width: 100%;
+ font-size: 30rpx;
+ text-align: center;
+ color: white;
+ border-radius: 40rpx;
+}
+
+.spec-add-cart {
+ background-color: #ffb03f;
+}
+
+.spec-buy {
+ background-color: #f23030;
+ /* margin-left: 34rpx; */
+}
+
+.spec-cart-disable {
+ background: #bbbbbb;
+}
+
+.spec-cart-btn-lg {
+ width: 614rpx;
+}
+
+.prom-model {
+ position: fixed;
+ bottom: 0;
+ z-index: 20;
+ background: white;
+ width: 100%;
+ padding: 0 30rpx 30rpx;
+ font-size: 32rpx;
+ box-sizing: border-box;
+ overflow-x: hidden;
+}
+
+.prom-model .prom-title {
+ text-align: center;
+ margin: 30rpx 0;
+}
+
+.prom-model .logistics-item {
+ border: 0;
+}
+
+.prom-model .item-mes {
+ width: 500rpx;
+}
+
+.integral-btn {
+ width: 100%;
+ padding: 0rpx;
+ margin: 0rpx;
+}
+
+.clear {
+ clear: both;
+}
+
+.sto_v .title,
+.sto_v .stitle {
+ border-top: 1rpx solid #dedede;
+ border-bottom: 1rpx solid #dedede;
+ height: 78rpx;
+ line-height: 78rpx;
+}
+
+.sto_v .title .tubiao,
+.sto_v .stitle .tubiao {
+ width: 32rpx;
+ height: 32rpx;
+ margin-top: 23rpx;
+}
+
+.itemlists .item {
+ border-bottom: 1rpx solid #dedede;
+ height: 72rpx;
+ line-height: 72rpx;
+ font-size: 28rpx;
+ margin: 0 10rpx;
+}
+
+.cshu {
+ margin-bottom: 30rpx;
+ margin-top: 20rpx;
+}
+
+.cshu view {
+ color: #999;
+ font-size: 30rpx;
+ margin-left: 26rpx;
+}
+
+
+/*---活动特殊显示---*/
+.prom_show {
+ height: 120rpx;
+ display: flex;
+}
+
+.prom_show .secondkill-img {
+ width: 100%;
+ height: 100%;
+}
+
+.prom_show .spike-img {
+ width: 283rpx;
+ height: 57rpx;
+ top: 35rpx;
+ left: 31rpx;
+}
+
+.prom_show .stop {
+ color: #d81731;
+ top: 17rpx;
+ right: 65rpx;
+ font-weight: 600;
+}
+
+.prom_show .start {
+ color: #009ae2;
+ top: 17rpx;
+ right: 65rpx;
+ font-weight: 600;
+}
+
+.prom_show .timeac {
+ font-size: 32rpx;
+ height: 120rpx;
+ color: #333;
+}
+
+.prom_show .timeac.left {
+ width: 66%;
+ color: #fff;
+ background: #f23030;
+}
+
+.prom_show .timeac.right {
+ width: 34%;
+ background-color: #d7d7d7;
+ text-align: center
+}
+
+.prom_show .secview .day {
+ padding-right: 10rpx;
+}
+
+.prom_show .secview .time-val {
+ width: 36rpx;
+ height: 36rpx;
+ border-radius: 7rpx;
+ line-height: 36rpx;
+}
+
+.prom_show .secview .time {
+ margin-right: 10rpx;
+ margin-left: 10rpx;
+}
+
+
+.prom_show .timeac.left view {
+ margin-left: 20rpx
+}
+
+.prom_show .timeac.left view.firview {
+ margin-top: 10rpx
+}
+
+.prom_show .timeac.left view .tr_line {
+ text-decoration: line-through;
+ font-size: 28rpx;
+}
+
+.prom_show .timeac.left view .bprice {
+ font-size: 50rpx;
+}
+
+.prom_show .timeac.right view.firview {
+ margin-top: 12rpx;
+ margin-bottom: 10rpx
+}
+
+.prom_show .timeac.right view.secview {
+ display: flex;
+ text-align: center;
+ justify-content: center;
+ flex-direction: row;
+}
+
+.prom_show .timeac.right view .tui-conutdown-box {
+ /* background: #6b6b6b; */
+ width: auto;
+ /* min-width: 45rpx; */
+ height: 45rpx;
+ color: #c4182e;
+ font-size: 27rpx;
+ text-align: center;
+ line-height: 46rpx;
+}
+
+.huise {
+ background: gray
+}
+
+.lanse {
+ background: #0199e2
+}
+
+
+/*------拼单------*/
+.pt_view {
+ text-align: center;
+ width: 100%;
+ height: 100rpx;
+ line-height: 100rpx;
+ font-size: 26rpx
+}
+
+.pt_view .secondkill-img {
+ width: 100%;
+ height: 100%;
+}
+
+.pt_fir {
+ background: #fff;
+ margin-bottom: 10rpx;
+}
+
+.pt_fir .pt_fir_title {
+ display: flex;
+ align-items: center;
+ margin-left: 10rpx;
+ margin-top: 20rpx;
+ font-size: 28rpx;
+ position: relative;
+}
+
+.pt_fir .pt_fir_title .kt_type {
+ color: #fff;
+ background: #e9030d;
+ width: 100rpx;
+ line-height: 40rpx;
+ border-radius: 6rpx;
+ margin: 0 10rpx;
+ height: 40rpx;
+ font-size: 24rpx;
+ text-align: center;
+}
+
+.pt_fir .pt_fir_title .price {
+ color: #e9030d;
+ font-size: 26rpx;
+}
+
+.pt_fir .pt_fir_title .bigw {
+ font-size: 36rpx;
+}
+
+.pt_fir .pt_fir_title .tprice {
+ text-decoration: line-through;
+ color: #949494
+}
+
+.pt_fir .pt_fir_title .tprice.ml50 {
+ margin-left: 50rpx
+}
+
+.pt_fir .pt_fir_title .js {
+ padding: 0 15rpx;
+ height: 40rpx;
+ background: #e9030d;
+ text-align: center;
+ border-radius: 8rpx;
+ color: #fff;
+ margin-left: 10rpx;
+}
+
+.pt_fir .pt_fir_title .tuannum {
+ color: #e9030d;
+ position: absolute;
+ right: 20rpx;
+ font-size: 26rpx;
+}
+
+.pding {
+ padding-top: 20rpx;
+ padding-left: 20rpx;
+ height: 81%;
+ padding-right: 20rpx;
+ font-size: 26rpx;
+ color: #ea120f
+}
+
+.pdres {
+ margin-left: 10rpx;
+ color: #8f8f94
+}
+
+.ptgz {
+ position: relative;
+ font-size: 30rpx;
+ padding-left: 20rpx;
+ margin-top: 10rpx;
+ overflow: hidden
+}
+
+.shuxian {
+ width: 6rpx;
+ height: 28rpx;
+ background: #ea120f;
+ display: inline-block;
+ top: 5rpx;
+ position: relative;
+ margin-right: 5rpx
+}
+
+.ptgz_an {
+ position: absolute;
+ top: 5rpx;
+ right: 6rpx
+}
+
+.ptgz_an .arrow-two {
+ width: 18rpx;
+ height: 18rpx;
+ border-color: #da0b31;
+ margin-top: 30rpx;
+}
+
+.pt_fir.se {
+ height: auto;
+ margin-bottom: 10rpx
+}
+
+.t_gz {
+ padding: 10rpx 20rpx;
+ font-size: 28rpx
+}
+
+.pt_fir.se1 {
+ height: auto;
+ margin: 0
+}
+
+.pt_fir.se2 {
+ height: auto;
+ margin: 0;
+ border-top: 6rpx solid #eeeeee;
+ border-bottom: 2rpx solid #eeeeee;
+}
+
+.pt_hb {
+ height: 78rpx;
+ line-height: 75rpx;
+ position: relative;
+ font-size: 32rpx;
+ overflow: hidden;
+ width: 695rpx;
+ margin-left: 28rpx;
+ border-bottom: 1rpx solid #E5E5E5
+}
+
+.ptgz_an.xq {
+ font-size: 32rpx;
+ color: #d40024
+}
+
+.wf {
+ display: flex;
+ padding: 20rpx 0;
+}
+
+.wf .item {
+ width: 24.5%;
+ text-align: center;
+ font-size: 26rpx;
+ color: #666
+}
+
+.wf .item .item_txy {
+ position: relative;
+ width: 60rpx;
+ height: 60rpx;
+ background: #ea120f;
+ border-radius: 50%;
+ left: 50%;
+ margin-left: -30rpx;
+ border: 3px #dfdfdf solid;
+ text-align: center;
+ line-height: 60rpx;
+ color: #fff;
+ margin-bottom: 10rpx;
+}
+
+.wf .item .item_txy.hs {
+ background: #cbcbcb;
+}
+
+.po {
+ margin-bottom: 20rpx;
+}
+
+.cart-btn.line-h {
+ line-height: 26rpx;
+}
+
+.cart-btn .fir-v {
+ margin-top: 10rpx;
+}
+
+.hyt {
+ padding: 0 20rpx;
+ font-size: 30rpx;
+ display: flex;
+ align-items: center;
+ margin-top: 10rpx;
+}
+
+.hyt .r_f {
+ color: #e9120f;
+ font-size: 26rpx;
+ position: relative;
+ top: 3rpx
+}
+
+.hyt .byj {
+ color: #e9120f;
+ font-size: 32rpx;
+ position: relative;
+ top: 5rpx
+}
+
+.pt_fir .pt_fir_title.no-mar-b {
+ margin-bottom: 0;
+ padding-bottom: 10rpx;
+ margin-left: 20rpx
+}
+
+.pt_fir .pt_fir_title.boder-1 {
+ border-bottom: 1rpx #e7e7e7 solid
+}
+
+.jie_price {
+ padding: 10rpx 30rpx;
+}
+
+.jie_price_title {
+ font-size: 30rpx;
+ color: #a26270;
+ margin-bottom: 10rpx
+}
+
+.price_list {
+ display: flex;
+ width: 100%;
+}
+
+.price_item {
+ width: 25%;
+ font-size: 28rpx;
+ color: #4c336c
+}
+
+.pt_fir.se2 .zzk-1 {
+ margin-top: 23rpx;
+ font-size: 30rpx;
+ position: relative;
+ margin-bottom: 30rpx;
+ border-left: 4rpx solid red;
+ margin-left: 14rpx;
+ height: 30rpx;
+ line-height: 30rpx;
+ padding-left: 5rpx;
+}
+
+.ckgd {
+ position: absolute;
+ top: 0;
+ right: 57rpx;
+ color: #d70025;
+ font-size: 32rpx;
+}
+
+.ckgd .arrow-one {
+ width: 18rpx;
+ height: 18rpx;
+ border-color: #da0b31;
+ margin-top: 5rpx;
+}
+
+.bview {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0, 0, 0, 0.5);
+}
+
+.juzhong {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+ align-items: center;
+}
+
+.juzhong .xq {
+ padding: 0 20rpx;
+ background: #fff;
+ font-size: 30rpx;
+ padding-bottom: 20rpx;
+}
+
+.juzhong .xq .title {
+ text-align: center;
+ margin: 20rpx 0;
+ position: relative;
+ height: 50rpx;
+}
+
+.juzhong .xq .hs1 {
+ font-size: 28rpx;
+ color: #ab8f9e
+}
+
+.juzhong .xq .title .close {
+ position: absolute;
+ top: 0;
+ right: 0;
+ width: 45rpx;
+ height: 45rpx;
+}
+
+.pt_qd {
+ /* margin-top: 40rpx;
+ height: auto; */
+}
+
+.spec-cart-btn.w100 {
+ width: 95%;
+ margin-left: 0;
+ height: 75rpx;
+ line-height: 75rpx;
+ margin: auto;
+}
+
+.sto_v {
+ color: #333;
+}
+
+.ellipsis {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
+
+
+
+
+/* 房子图标 */
+.stores-img {
+ width: 40rpx;
+ height: 35rpx;
+ margin-right: 10rpx;
+}
+
+.right-arrow {
+ width: 15rpx;
+ height: 15rpx;
+ border-top: 2rpx solid #d70026;
+ border-right: 2rpx solid #d70026;
+ transform: rotate(45deg);
+ display: inline-block;
+ margin-bottom: 3rpx;
+}
+
+.distance{
+ padding-left: 15rpx;
+ padding-right: 15rpx;
+ background: #eee;
+ border-radius: 20rpx;
+ margin-right: 5rpx;
+ color: #999;
+ height: 38rpx;
+ line-height: 38rpx;
+}
+
+.shop_name{
+ margin-right: 10rpx;
+}
+
+.xc-distance-top{
+ margin-top: 10rpx;
+}
+
+
+.popup-frame{
+ position: fixed;
+ /* bottom:99rpx; */
+ bottom: 0;
+ z-index: 20;
+ background: white;
+ width: 100%;
+ border-radius: 20rpx 20rpx 0 0;
+ height: auto;
+}
+
+.popup-top{
+ border-bottom: 1rpx solid #eee;
+ height: 155rpx;
+ width: 95%;
+ margin: auto;
+ line-height: 155rpx;
+
+}
+
+
+/* .flex-space-between{
+ display: flex;
+ justify-content:space-between;
+} */
+
+.modal-closes {
+ position: absolute;
+ right: 30rpx;
+ top: -15rpx;
+ height: 25rpx;
+}
+
+.choose_more{
+ margin-top: 40rpx;
+ margin-right: 20rpx;
+
+}
+.choose_mores{
+ margin-top: 30rpx;
+ margin-right: 15rpx;
+
+}
+
+.bg_rights{
+ border-top: 2rpx solid ;
+ border-right: 2rpx solid ;
+ transform: rotate(45deg);
+ display: inline-block;
+ width: 15rpx;height:15rpx;
+ border-color: #da0b31;
+}
+
+
+.mongolia-layer{
+ position: fixed;
+ left: 0;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ z-index: 11;
+ background: rgba(0,0,0,0.4);
+ width: 100%;
+ height: 91.9%;
+}
+
+
+
+
+.store-list{
+ width: 95%;
+ min-height:300rpx;
+ overflow-y: scroll;
+ margin: auto;
+ max-height: 610rpx;
+}
+
+.store-list .store_choose{
+ width: 100%;
+ height: 120rpx;
+ line-height: 125rpx;
+ border-bottom: 1rpx solid #eee;
+}
+
+.store-list .store_choose .store{
+ width: 100%;
+ margin: auto;
+ line-height: 37rpx;
+ padding-left: 20rpx;
+}
+
+.xc-hook{
+ width: 35rpx;
+ height: 35rpx;
+ transform: rotate(-145deg);
+ line-height: 37rpx;
+ text-align: center;
+}
+
+.butttem5{
+ margin-bottom: 5rpx;
+}
+
+.address-frame{
+ width: 93%;
+ margin-left: 7rpx;
+}
+
+.store-bottom{
+ width: 85%;
+ margin: auto;
+ height: 90rpx;
+ }
+
+ .determine{
+ width: 260rpx;
+ height: 55rpx;
+ border-radius: 50rpx;
+ line-height: 55rpx;
+ }
+
+ .default{
+ width: 260rpx;
+ height: 55rpx;
+ border:3rpx solid #c8c8c8;
+ border-radius: 50rpx;
+ line-height: 55rpx;
+ }
+
+ .sort_store_list .sort-store-frame .sort-store {
+ width: 94.5%;
+ margin: auto;
+ }
+
+
+ .sort_store_list .sort-store-frame{
+ width: 100%;
+ height: 100rpx;
+ line-height:100rpx;
+ border-bottom: 1rpx solid #eee;
+ }
+
+ .black_rights-frame .black_rights{
+ border-top: 3rpx solid;
+ border-right: 3rpx solid;
+ transform: rotate(45deg);
+ display: inline-block;
+ width: 20rpx;
+ height: 20rpx;
+ }
+
+
+ .sort_store_list{
+ max-height: 700rpx;
+ overflow: hidden;
+ overflow-y: scroll;
+ width: 95%;
+ margin: auto;
+ }
+
+ .xc-hooks{
+ width: 30rpx;
+ height: 30rpx;
+ border: 1rpx solid #999;
+}
+
+.no_store{color:#d60021; font-size: 26rpx;}
+
+.sub.active {
+ /* background-color: #ddd; */
+ color: #ccc;
+}
+
+.c-red22{ color:#d60021; }
diff --git a/packageG/pages/team/team_success/team_success.js b/packageG/pages/team/team_success/team_success.js
index ae21080..49fdbfc 100644
--- a/packageG/pages/team/team_success/team_success.js
+++ b/packageG/pages/team/team_success/team_success.js
@@ -448,7 +448,7 @@ Page({
//二微码
var path3 = os.url+ "/api/wx/open/app/user/getWeAppEwm/"+
- os.stoid+"?sceneValue="+scene+"&pageValue=pages/team/team_show/team_show";
+ os.stoid+"?sceneValue="+scene+"&pageValue=packageG/pages/team/team_show/team_show";
console.log(path3,6000);
@@ -840,7 +840,7 @@ Page({
var th=this;
var scene=this.data.teamgroup.id;
var goods_id=this.data.teamlist.goods_id;
- var url="/pages/team/team_show/team_show?tg_id="+scene+"&goods_id="+goods_id;
+ var url="/packageG/pages/team/team_show/team_show?tg_id="+scene+"&goods_id="+goods_id;
//--分享图片--
var img=th.data.iurl+th.data.teamlist.share_imgurl;
//--把会员分享出去--
diff --git a/packageG/pages/user/userinfo/userinfo.js b/packageG/pages/user/userinfo/userinfo.js
index 1773a31..b4b0803 100644
--- a/packageG/pages/user/userinfo/userinfo.js
+++ b/packageG/pages/user/userinfo/userinfo.js
@@ -5,7 +5,7 @@ function e(e, a, r) {
configurable: !0,
writable: !0
}) : e[a] = r, e;
-}
+}
var a = getApp(),
r = a.globalData.setting,
@@ -13,7 +13,7 @@ var a = getApp(),
s = require("../../../../utils/common.js"),
util = require("../../../../utils/util.js"),
ut = util,
- d = getApp().globalData;
+ d = getApp().globalData;
var timestamp = Date.parse(new Date());
var date = new Date(timestamp);
@@ -76,7 +76,10 @@ Page({
getusercode_vailtime:10,//会员二维码时效
sele_ing:0,
- set_isstcsp:0
+ set_isstcsp:0,
+ brcode:'',
+
+ showvipcode:false,
},
//通过路径跳转到其他页面
@@ -85,6 +88,11 @@ Page({
var url = e.currentTarget.dataset.url;
getApp().goto(url);
},
+ showtext:function(){
+ this.setData({
+ showvipcode:true
+ })
+ },
//获取配置信息
get_config: function() {
var th = this;
@@ -922,10 +930,12 @@ Page({
//base64_encode($user.mobile.'|'.date('Y-m-d H:i:s')
var val = that.data.userInfo.mobile + "|" +getnowtime+"|"+that.data.getusercode_vailtime;
val = "^" + ut.base64_encode(val);
-
- qrcode('qrcode', val, 480, 480, that);
+ let userInfo = getApp().globalData.userInfo;
+ qrcode('qrcode', val, 350, 350, that);
+ barcode('barcode', userInfo.userQrcode, 480,140);
that.setData({
tc_hide: false,
+ brcode:userInfo.userQrcode
});
}
}
diff --git a/packageG/pages/user/userinfo/userinfo.wxml b/packageG/pages/user/userinfo/userinfo.wxml
index 8e92f9a..00744c9 100644
--- a/packageG/pages/user/userinfo/userinfo.wxml
+++ b/packageG/pages/user/userinfo/userinfo.wxml
@@ -1,7 +1,7 @@
-
+
@@ -297,8 +297,8 @@
-
-
+
+
@@ -309,11 +309,19 @@
{{user.address}}
-
-
+
+
- 扫一扫上面的二维码图案,即可消费
+
+
+
+
+ {{brcode}}
+
+
+ 点击可查看条形数据
+
diff --git a/packageG/pages/user/userinfo/userinfo.wxss b/packageG/pages/user/userinfo/userinfo.wxss
index 8d60f47..1369b89 100644
--- a/packageG/pages/user/userinfo/userinfo.wxss
+++ b/packageG/pages/user/userinfo/userinfo.wxss
@@ -201,15 +201,18 @@ input {
top: 0px;
background: rgba(0, 0, 0, 0.4);
overflow: hidden;
+ z-index: 9;
}
.modal-body {
position: fixed;
- top: 80rpx;
+ top: 0;
left: 0;
+ bottom: 0;
+ right: 0;
z-index: 100;
background: #fff;
- margin-left: 73rpx;
+ margin: auto;
width: 600rpx;
height: 860rpx;
border-radius: 8px;
@@ -271,8 +274,8 @@ input {
}
.g_img {
- width: 480rpx;
- height: 480rpx;
+ width: 350rpx;
+ height: 350rpx;
}
.s_sao {
@@ -666,3 +669,9 @@ input {
.lb_txt{
color: red; font-size: 24rpx;
}
+.canvas_box{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ /* margin-top: 20rpx; */
+}
\ No newline at end of file
diff --git a/packageG/pages/user_template/index.js b/packageG/pages/user_template/index.js
new file mode 100644
index 0000000..7ca1dca
--- /dev/null
+++ b/packageG/pages/user_template/index.js
@@ -0,0 +1,630 @@
+var t = getApp(),
+ a = t.request,
+ os = t.globalData.setting,
+ ut = require("../../../utils/util.js"),
+ com = require("../../../utils/common.js");
+var regeneratorRuntime = require('../../../utils/runtime.js');
+const rq = require("../../../utils/request.js");
+var appd = getApp().globalData;
+
+Page({
+ data: {
+ url: os.imghost,
+ temp_id: 0,
+ goodsGroupArr: [],
+ pulscardname: '',
+ rfmName: '成长值',
+
+ byquan: 0,
+ yuer: 0,
+ udata: {},
+
+ is_assistance: 0, //助力活动
+ b_gift:null, //生日礼包
+ toji: null, //统计相关
+
+ userInfo:null,
+ enableMeiye:null,
+
+ is_show_recommend:false,
+ },
+
+ onLoad: function (e) {
+ var th = this;
+ this.data.temp_id = e.scene;
+ if (!this.data.temp_id) wx.showModal({title: "未读取到模板ID",})
+
+ var first_leader = e.first_leader;
+ if (first_leader) {
+ //-- user_id代过来免登录 --
+ getApp().globalData.first_leader = first_leader;
+ //调用接口判断是不是会员
+ getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => {
+ if (res.data.code == 0) {
+ getApp().globalData.guide_id = res.data.data.id;
+ getApp().globalData.guide_pick_id = res.data.data.pickup_id
+ }
+ })
+ }
+ //判断有没有登陆
+ setTimeout(() =>{
+ if (!getApp().globalData.userInfo) {
+ getApp().goto('/packageE/pages/togoin/togoin');
+ }
+ },1500)
+
+ },
+
+ async onShow() {
+ getApp().check_can_share();
+ var th = this;
+
+ if(!th.data.userInfo){
+ this.data.userInfo =getApp().globalData.userInfo;
+ }
+
+ /*-----统计-----*/
+ getApp().request.get("/api/weshop/order/waitlist", {
+ isShowLoading: 0,
+ data: {
+ user_id: getApp().globalData.user_id,isdel:0
+ },
+ success: function (su) {
+ th.setData({
+ toji: su.data.data,
+ });
+ }
+ })
+
+ /*-------系统是否开通等级卡,会员是等级卡-----*/
+ getApp().getConfig2(function (e) {
+ var t_swi = e.switch_list;
+ if (t_swi) t_swi = JSON.parse(t_swi)
+ if (t_swi) {
+ th.setData({sys_switch: t_swi});
+ var user_tool = [];
+ if (t_swi.usertool) user_tool = JSON.parse(t_swi.usertool);
+ th.setData({c_list: user_tool});
+
+ if (parseInt(t_swi.rank_switch) == 2) {
+ var userInfo = th.data.userInfo;
+ if (userInfo && userInfo.card_field != null && userInfo.card_field != undefined && userInfo.card_field != "") {
+ var now = ut.gettimestamp();
+ var str = userInfo.card_expiredate;
+ var end = new Date(str);
+ end = Date.parse(end) / 1000;
+ //---判断是不是有过期---
+ if (now < end) {
+ th.setData({
+ is_dengji: 1
+ })
+ } else {
+ th.setData({
+ is_dengji: 3
+ })
+ }
+ } else {
+ th.setData({
+ is_dengji: 2
+ })
+ }
+ }
+ }
+ })
+
+ //--我的权益初始化是否有打勾,--
+ getApp().request.get("/api/weshop/users/grade/vip/init/get", {
+ data: {
+ storeId: os.stoid
+ },
+ success: function (rs) {
+ if (rs.data.code == 0 && rs.data.data.isBool) {
+ th.setData({is_init: 1});
+ /*-----获取会员权益列表-----*/
+ rq.get("/api/weshop/users/grade/vipprivilegeinfo/page", {
+ isShowLoading: 0,
+ data: {
+ storeId: os.stoid,
+ pageSize: 100
+ },
+ success: async function (res) {
+
+ //判断有没有值,没有值返回
+ if (!ut.ajax_ok(res)) return false;
+
+ var arr_data = res.data.data.pageData;
+ var gid = null,
+ g_qy_list = null,
+ cz_vals = 0,
+ need_money = 0,
+ backClass = null,
+ GradeName = '';
+
+ var app_d = getApp().globalData;
+
+ //获取成长值
+ await getApp().request.promiseGet("/api/weshop/users/grade/aftervipinfo/get", {
+ data: {
+ storeId: os.stoid,
+ userId: app_d.user_id
+ }
+ }).then(res => {
+ if (res.data.code == 0 && res.data.data) {
+ gid = res.data.data.GradeId;
+ var cz_val = res.data.data.GradeSum;
+ cz_vals = parseInt(cz_val);
+ GradeName = res.data.data.GradeName;
+ }
+ //th.setData({ cz_val: cz_vals, GradeName: res.data.data.GradeName, is_init: is_init, gradeId: gid});
+ })
+ var obj = {
+ cz_val: cz_vals,
+ GradeName: GradeName,
+ gradeId: gid,
+ is_grad_get: 1
+ };
+
+ // 获取最大值
+ await getApp().request.promiseGet("/api/weshop/users/grade/vipgradeinfo/page", {
+ data: {
+ storeId: os.stoid
+ }
+ }).then(res => {
+ if (res.data.data)
+ backClass = res.data.data.pageData;
+ if (backClass) {
+ var full_cz_val = backClass[backClass.length - 1].BuyGradeSum;
+ obj.full_cz_val = full_cz_val
+ }
+ })
+
+ //--会员权益中心页的修改--
+ for (var i in backClass) {
+ var im = backClass[i];
+ if (cz_vals < im.BuyGradeSum && need_money == 0) {
+ need_money = im.BuyGradeSum;
+ obj.need_money = need_money;
+ obj.nextGradeName=im.GradeName;
+ break;
+ }
+ }
+
+ //获取当前等级的特权
+ await getApp().request.promiseGet("/api/weshop/users/grade/privilegeform/list/page", {
+ data: {
+ storeId: os.stoid,
+ GradeId: gid,
+ userId: app_d.user_id,
+ pageSize: 100
+ }
+ }).then(res => {
+ if (res.data.data)
+ g_qy_list = res.data.data.pageData;
+ });
+
+ for (var i in arr_data) {
+ var item = arr_data[i];
+ var FromId = th.check_is_has_qy(item, g_qy_list);
+ arr_data[i].ishas = 0;
+ if (FromId) {
+ arr_data[i].ishas = 1;
+ arr_data[i].FromId = FromId;
+ }
+ }
+ arr_data.sort(function (a, b) {
+ return b.ishas - a.ishas
+ })
+
+ //4个4个一组
+ var arr = new Array();
+ for (var i = 0; i < arr_data.length; i += 4) {
+ arr.push(arr_data.slice(i, i + 4));
+ }
+ //th.setData({ qy_list: arr, need_money: need_money});
+ obj.qy_list = arr;
+ obj.old_qy_list = arr_data;
+ th.setData(obj);
+ obj.is_init = 1;
+ th.setData({qy_data: obj})
+ }
+ })
+ }
+ }
+ })
+
+ this.puls_user();
+ this.getVison();
+
+ //-----获取线下会员的预存款和优惠券的数量-----
+ getApp().request.get("/api/weshop/users/getinfo/" + os.stoid + "/" + getApp().globalData.user_id, {
+ isShowLoading: 0,
+ success: function (su) {
+ if (su.data.code == 0 && su.data.data) {
+ var data = su.data.data;
+ if (!data) data = {};
+ data.cashcount = parseInt(data.cashcount);
+ th.setData({
+ udata: data,
+ });
+ }
+ }
+ })
+
+ //-----获取会员提现金额-----
+ getApp().request.get("/api/weshop/withdrawals/summoney", {
+ isShowLoading: 0,
+ data: {
+ user_id: getApp().globalData.user_id,
+ store_id: os.stoid,
+ status: 0
+ },
+ success: function (su) {
+ if (su.data.code == 0) {
+
+ let user = getApp().globalData.userInfo;
+ var yuer = parseFloat(user.user_money - user.frozen_money - su.data.data.summoney).toFixed(2);
+ th.setData({
+ txmon: su.data.data.summoney,
+ yuer: yuer
+ });
+ }
+ }
+ })
+
+ /*-----获取会员包邮券的数量-----*/
+ getApp().request.get("/api/weshop/userfeemail/page", {
+ isShowLoading: 0,
+ data: {
+ user_id: getApp().globalData.user_id,
+ store_id: os.stoid,
+ pageSize: 1,
+ isuse: 0
+ },
+ success: function (su) {
+ if (su.data.code == 0) {
+ th.setData({
+ byquan: parseInt(su.data.data.total)
+ });
+ }
+ }
+ });
+
+
+ // 判断是否开启美业
+ getApp().promiseGet('/api/weshop/store/getTabSys/' + os.stoid, {}).then(res => {
+ if (res.data.code == 0) {
+ th.setData({
+ enableMeiye: res.data.data.EnableMeiye,
+ });
+ };
+ });
+
+ //判断一下是不是助力活动
+ this.is_assistance();
+ //获取工具
+ await this.init_user_tool();
+ //获取一下生日相关
+ this.birthday();
+
+ //获取自定义模板
+ await this.init_load();
+
+ //自定义组件一定要等到页面加载完了,才来调用selectComponnent
+ setTimeout(function () {
+
+ th.setData({ is_show_recommend:true })
+ if (getApp().globalData.user_id) getApp().requestCardNum(th);
+ var goods_list = th.selectComponent("#goods_recommend"); //组件的id
+
+ if(goods_list){
+ goods_list.init();
+ goods_list.get_list();
+ }
+
+ }, 1500)
+
+ },
+
+ //获取商品模块实例
+ newGoodsGroup() {
+ let arr = []
+ if (this.data.template_arr.length == 0) {
+ return
+ }
+ this.data.template_arr.map((item, index) => {
+ if (item.ename == 'goodsGroup') {
+ arr.push(`goodsGroup${index}`)
+ }
+ })
+ if (arr.length > 0) {
+ this.setData({
+ goodsGroupArr: arr
+ })
+ arr.map(item => {
+ let a = '.' + item
+ this[item] = this.selectComponent(a);
+ })
+ }
+ },
+ //当隐藏的时候就关闭计时器
+ onHide: function () {
+
+ },
+ //同步初始加载
+ async init_load() {
+ var th = this;
+ //因为营销版本的功能包含了自定义模板的功能,是同时的
+ //读取全局是否有弄自定义模板
+ await getApp().request.promiseGet("/api/weshop/store_module/get/" + th.data.temp_id + "/8", {1: 1}).then(res => {
+ var data = res.data.data;
+ if (data) {
+ var temp_data = data;
+ wx.setNavigationBarTitle({
+ title: temp_data.page_title,
+ });
+ var t_arr = JSON.parse(temp_data.json_str);
+
+ let obj={
+ share_title: temp_data.page_title,
+ template_arr: t_arr,
+ isTemplate: 1,
+ bgcolor_t: temp_data.bkcolor
+ };
+
+ setTimeout(() => {
+ th.newGoodsGroup()
+ }, 1000)
+
+ //---如果有设定顶部的颜色的时候--
+ if (temp_data.top_color && temp_data.top_color != 'null') {
+ var top_w_color = "#ffffff";
+ if (temp_data.top_word_color) {
+ top_w_color = temp_data.top_word_color
+ }
+ wx.setNavigationBarColor({
+ frontColor: top_w_color, // 必写项
+ backgroundColor: temp_data.top_color, // 必写项
+ })
+ obj.topwColor=top_w_color;
+ obj.topbgColor=temp_data.top_color;
+ }
+
+ th.setData(obj);
+
+ }
+ })
+ },
+
+ onPullDownRefresh: function (e) {
+
+ },
+
+
+ onShareAppMessage: async function (e) {
+ var th = this;
+ getApp().globalData.no_clear = 1;
+ getApp().getConfig(await function (e) {
+ th.setData({
+ store_config: e
+ })
+ }.bind(this))
+
+ var url = `pages/template/index?sence=` + this.data.temp_id;
+ var userInfo = getApp().globalData.userInfo;
+ //是分销商才带
+ if (userInfo) {
+ url += "&first_leader=" + userInfo.user_id;
+ }
+
+ var ob = {
+ title: this.data.share_title,
+ path: url,
+ //imageUrl:this.data.url+this.data.store_config.store_logo,
+ };
+ return ob;
+ },
+
+ /**
+ * 用户分享朋友圈
+ */
+ async onShareTimeline() {
+
+ var th = this;
+ getApp().globalData.no_clear = 1;
+ getApp().getConfig(await function (e) {
+ th.setData({
+ store_config: e
+ })
+ }.bind(this))
+ var {share_title, temp_id, store_config} = this.data;
+ var url = `sence=${temp_id}`;
+
+ var userInfo = getApp().globalData.userInfo;
+ //是分销商才带
+ if (userInfo) {
+ url += "&first_leader=" + userInfo.user_id;
+ }
+
+ var ob = {
+ title: share_title,
+ query: url,
+ //imageUrl:this.data.url+store_config.store_logo,
+ };
+ console.log(ob);
+ return ob;
+ },
+
+ //---加载更多是靠这个函数----
+ onReachBottom: function () {
+ if (getApp().globalData.func_list) {
+ for (let i in getApp().globalData.func_list) {
+ let item = getApp().globalData.func_list[i];
+ item.re_show();
+ }
+ }
+
+ //自定义时商品自动加载更多
+ let goodsGroupArr = this.data.goodsGroupArr
+ if (this.data.isTemplate && goodsGroupArr.length > 0) {
+ goodsGroupArr.map(item => {
+ this[item].automore()
+ })
+ }
+
+ var e = getApp().globalData.userInfo;
+ if (e != undefined && e != null && e.mobile) {
+ var goods_list = this.selectComponent("#goods_recommend"); //组件的id
+ goods_list.init();
+ setTimeout(function () {
+ goods_list.get_list();
+ }, 300)
+ }
+
+ },
+
+ //-----Plus会员获取-----------
+ puls_user: function () {
+ var th = this;
+ getApp().request.get("/api/weshop/plus/vip/mem/list", {
+ data: {
+ storeId: os.stoid,
+ userId: getApp().globalData.user_id,
+ },
+ success: function (su) {
+ if (su.data.code == 0) {
+ var cardname = su.data.data[0].MemCardName;
+ th.setData({
+ pulscardname: cardname
+ });
+ }
+ }
+ });
+ },
+
+ //判断会员是后有改服务项目
+ check_is_has_qy: function (item, g_qy_list) {
+ if (!g_qy_list) return false;
+
+ for (var i in g_qy_list) {
+ var iter = g_qy_list[i];
+ if (iter.FormId == item.Id) return g_qy_list[i].FormId;
+ }
+ return false;
+ },
+
+ //获取会员权益等级是否升级
+ getVison() {
+ let isRfm = wx.getStorageSync('isRfm')
+ if (isRfm) {
+ this.setData({
+ rfmName: '综合分'
+ })
+ } else {
+ rq.get(`/api/weshop/users/grade/vip/getSysPara?storeId=${os.stoid}&classInfo=IsUpRMF`, {
+ success: (res) => {
+ console.log('会员权益等级升级查询-------');
+ console.log(res);
+ if (res.data.code == 0 && res.data.data && res.data.data.IsBool) {
+ this.setData({
+ rfmName: '综合分'
+ })
+ wx.setStorageSync('isRfm', true)
+ }
+ }
+ })
+ }
+ },
+
+
+ //-- 初始话按钮图标,服务与工具的优化 ---
+ init_user_tool: async function () {
+ var d_list = null;
+ //读取user_tool按钮图标
+ await getApp().promiseGet("/api/weshop/userTool/page?pageSize=100&store_id=" + os.stoid, {}).then(res => {
+ if (ut.ajax_ok(res)) {
+ d_list = res.data.data.pageData;
+ }
+ })
+
+ if (!d_list) return false;
+ //过滤掉分销关闭的
+ let distribut_end_time = await getApp().user_tools_endTime(2);//过滤掉分销到期的
+ await getApp().promiseGet("/api/weshop/storeDistribut/get/" + os.stoid, {}).then(rs => {
+ if (rs.data.code == 0 || !rs.data.data) {
+ var is_ok = 1;
+
+ if (!distribut_end_time) {
+ is_ok = 0;
+ } else if (!rs.data.data) {
+ is_ok = 0;
+ } else {
+ var dis = rs.data.data;
+ if (!dis || dis.switch == 0) {
+ is_ok = 0;
+ }
+ }
+
+ for (var i in d_list) {
+ if (d_list[i].name == '我的分销' && !is_ok) {
+ d_list.splice(i, 1);
+ }
+ }
+ }
+ })
+
+ //判断有没有开AI测肤
+ await getApp().promiseGet("/api/weshop/wx/weappSkin/get/" + os.stoid, {}).then(rs => {
+ if (rs.data.code != 0 || !rs.data.data) {
+ for (var i in d_list) {
+ if (d_list[i].name == 'AI测肤') {
+ d_list.splice(i, 1);
+ }
+ }
+ }
+ })
+ this.setData({user_tool: d_list});
+ },
+
+ // 判断助力活动是不是存在
+ is_assistance: function () {
+ var th = this, r = Math.random() * 100;
+ getApp().promiseGet("/api/weshop/marketing/help/act/judge", {
+ data: {
+ storeId: os.stoid,
+ userId: getApp().globalData.user_id,
+ r: r,
+ }
+ }).then(res => {
+ var code = res.data.code;
+ if (code == 0) {
+ th.setData({
+ is_assistance: 1
+ });
+ } else {
+ th.setData({
+ is_assistance: 0
+ });
+ }
+ })
+ },
+
+ // 判断生日营销的页面是不是存在
+ birthday: function () {
+ var th = this;
+ getApp().request.get("/api/weshop/marketing/birthday/act/judge", {
+ data: { storeId: os.stoid, userId: getApp().globalData.user_id },
+ success: function (res) {
+ var code = res.data.code;
+ if (code == 0) {
+ var giftbagid = res.data.data.giftBagId;
+ var actId = res.data.data.id;
+ var actImg = res.data.data.actImg;
+ th.setData({ b_gift:{ giftbagid: giftbagid, actId: actId, actImg: actImg } });
+ }
+
+ }
+ })
+ },
+
+
+});
\ No newline at end of file
diff --git a/packageG/pages/user_template/index.json b/packageG/pages/user_template/index.json
new file mode 100644
index 0000000..812fa47
--- /dev/null
+++ b/packageG/pages/user_template/index.json
@@ -0,0 +1,18 @@
+{
+ "navigationBarBackgroundColor": "#ff7295",
+ "navigationBarTextStyle": "white",
+ "usingComponents": {
+ "advertising":"/components/diy_advertising/diy_advertising",
+ "assist":"/components/diy_assist/diy_assist",
+ "diy_user_info":"/components/diy_user_info/diy_user_info",
+ "diy_user_order":"/components/diy_user_order/diy_user_order",
+ "diy_user_my_rights":"/components/diy_user_my_rights/diy_user_my_rights",
+ "diy_user_tools_services":"/components/diy_user_tools_services/diy_user_tools_services",
+ "com_top_nav": "/components/com_top_nav/com_top_nav",
+ "goods_recommend": "/components/goods_list/goods_list"
+ },
+ "enablePullDownRefresh": false,
+ "onReachBottomDistance":300,
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "会员中心"
+}
\ No newline at end of file
diff --git a/packageG/pages/user_template/index.wxml b/packageG/pages/user_template/index.wxml
new file mode 100644
index 0000000..dc62b9f
--- /dev/null
+++ b/packageG/pages/user_template/index.wxml
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 为你推荐
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packageG/pages/user_template/index.wxss b/packageG/pages/user_template/index.wxss
new file mode 100644
index 0000000..4c24611
--- /dev/null
+++ b/packageG/pages/user_template/index.wxss
@@ -0,0 +1,940 @@
+.pink-b {
+ background: #ff7295;
+}
+
+.search-box {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 88rpx;
+ z-index: 10;
+}
+
+.classify-img {
+ width: 50rpx;
+ height: 45rpx;
+}
+
+.logo {
+ width: 48rpx;
+ height: 48rpx;
+ margin: 0 18rpx;
+ border-radius: 50%;
+ overflow: hidden;
+}
+
+.search-inner {
+ display: flex;
+ align-items: center;
+ margin: 20rpx 25rpx;
+ width: 566rpx;
+ height: 58rpx;
+ border-radius: 29rpx;
+ background-color: #fff;
+ justify-content: center;
+}
+
+.search-img {
+ width: 30rpx;
+ height: 30rpx;
+ margin-left: 36rpx;
+ display: flex;
+ align-items: center;
+ position: absolute;
+ left: 10%;
+}
+
+.search-cont {
+ height: 58rpx;
+ width: 530rpx;
+ padding-left: 12rpx;
+ line-height: 58rpx;
+ font-size: 24rpx;
+ color: #666;
+ margin-left: 56rpx;
+}
+
+.search-fixed {
+ background: #ff7295;
+}
+
+.swiper_box {
+ width: 100%;
+ height: auto;
+}
+
+.s_prom {
+ width: 100%;
+ height: 340rpx;
+}
+
+.s_proms {
+ width: 100%;
+ height: 590rpx;
+}
+
+.slide-image {
+ width: 100%;
+ display: inline-block;
+ overflow: hidden;
+ border-radius: 14rpx;
+ height: auto;
+}
+
+.venues_box {
+ background-color: #fff;
+ padding: 20rpx 10rpx;
+}
+
+.venues_item {
+ display: block;
+ float: left;
+ width: 20%;
+ text-align: center;
+ margin: 25rpx 0;
+}
+
+.venues_item image {
+ vertical-align: middle;
+ width: 90rpx;
+ height: 90rpx;
+ border: 0;
+}
+
+.venues_item view {
+ font-size: 26rpx;
+ margin-top: 10rpx;
+}
+
+.choice_box {
+ font-size: 14px;
+}
+
+.choice_box .choice_list .choice_item {
+ width: 368rpx;
+ float: left;
+ margin: 2rpx;
+ background-color: #fff;
+}
+
+.choice_box .choice_list image {
+ width: 100%;
+ height: auto;
+}
+
+.title-img {
+ margin-top: 110rpx;
+ margin-bottom: 15rpx;
+ height: auto;
+}
+
+.choice_box .choice_list .title {
+ height: 36rpx;
+ line-height: 36rpx;
+ /* font-weight: bold; */
+ text-align: left;
+ color: #333;
+ margin-left: 20rpx;
+ font-size: 30rpx;
+}
+
+.choice_box .choice_list .choice_footer {
+ display: block;
+ margin-top: 20rpx;
+ margin-left: 15rpx;
+ position: relative;
+ height: 74rpx;
+ line-height: 17rpx;
+}
+
+.choice_box .choice_list .choice_footer .price {
+ color: #f23030;
+ height: 10px;
+}
+
+.choice_box .choice_list .choice_footer .similer {
+ position: absolute;
+ bottom: 0;
+ right: 0;
+ text-align: center;
+ color: #686868;
+ width: fit-content;
+ line-height: 30rpx;
+ border: 1rpx solid #bfbfbf;
+ padding: 1rpx 6rpx;
+ border-radius: 5rpx;
+}
+
+.section {
+ margin-top: 20rpx;
+ background-color: #fff;
+}
+
+.section-title {
+ padding-top: 30rpx;
+ height: 54rpx;
+ line-height: 54rpx;
+ font-size: 36rpx;
+ font-weight: 700;
+ color: #333;
+ text-align: center;
+ letter-spacing: 3rpx;
+}
+
+.section-subtitle {
+ line-height: 0;
+ width: 340rpx;
+ height: 16rpx;
+ padding-bottom: 20rpx;
+ margin: 0 auto;
+}
+
+.seckill {
+ margin-top: 20rpx;
+ background-color: #fff;
+ padding-bottom: 30rpx;
+}
+
+.seckill-time {
+ display: flex;
+ justify-content: space-between;
+ padding: 0 30rpx;
+ align-items: center;
+ height: 72rpx;
+ color: #333;
+ margin-bottom: 20rpx;
+}
+
+.sk-tips {
+ font-size: 36rpx;
+ font-weight: bold;
+ margin-right: 20rpx;
+}
+
+.sk-time {
+ position: relative;
+ display: inline-block;
+ font-size: 24rpx;
+ width: 36rpx;
+ line-height: 36rpx;
+ background-color: #333;
+ margin-right: 20rpx;
+ color: #fff;
+ text-align: center;
+}
+
+.sk-time::before {
+ content: ':';
+ position: absolute;
+ right: -13rpx;
+ top: 0;
+ color: #333;
+ font-weight: bold;
+}
+
+.sk-time:last-child::before {
+ content: '';
+}
+
+.seckill-time>navigator {
+ font-size: 28rpx;
+}
+
+.sk-pic {
+ width: 28rpx;
+ height: 28rpx;
+ vertical-align: top;
+}
+
+.seckill-list {
+ overflow: hidden;
+}
+
+/* .seckill-list navigator {
+ width: 236rpx; margin-right: 10rpx; position: relative;
+} */
+
+.seckill-list view {
+ height: 62rpx;
+ padding: 0 10rpx;
+ line-height: 33rpx;
+ overflow: hidden;
+ font-size: 28rpx;
+ width: 203rpx;
+}
+
+.seckill-list view.imgview {
+ width: 203rpx;
+ height: 210rpx;
+ position: relative;
+ overflow: hidden;
+}
+
+.imgview image {
+ width: 203rpx;
+ height: 203rpx;
+ border-radius: 10rpx;
+}
+
+.seckill-list view.djs_view {
+ background: rgba(9, 9, 9, 0.5);
+ color: #fff;
+ font-size: 20rpx;
+ width: 216rpx;
+ height: 36rpx;
+ line-height: 36rpx;
+ position: absolute;
+ bottom: 0;
+ left: 10rpx;
+ z-index: 5;
+ text-align-last: center;
+}
+
+.seckill-list image.status_img {
+ width: 100rpx;
+ height: 35rpx;
+ position: absolute;
+ top: 0rpx;
+ left: 10rpx;
+ z-index: 5;
+}
+
+.seckill-list view.status_view {
+ width: 60rpx;
+ height: 60rpx;
+ text-align: center;
+ line-height: 60rpx;
+ position: absolute;
+ background: #e9030d;
+ color: #fff;
+ font-size: 18rpx;
+ top: 5rpx;
+ right: 10rpx;
+ z-index: 5;
+ border-radius: 50%;
+ padding: 0;
+}
+
+.xiafa {
+ text-decoration: line-through;
+ font-size: 10px;
+ color: #999;
+ margin-left: 10rpx;
+}
+
+.shelue {
+ /* text-overflow: -o-ellipsis-lastline;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical; */
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+}
+
+.meiz {
+ padding: 0 10rpx;
+ background: #c4182e;
+ color: #fff;
+ height: 18px;
+ line-height: 18px;
+ margin-top: -10rpx;
+ border-radius: 10rpx;
+}
+
+.dengj {
+ padding: 0 10rpx;
+ background: #ffd700;
+ color: #fff;
+ height: 18px;
+ line-height: 18px;
+ margin-top: -10rpx;
+ border-radius: 10rpx;
+}
+
+.kongge {
+ width: 20rpx;
+}
+
+.choice_footer .ys {
+ color: #999;
+ margin-top: 20rpx;
+ font-size: 11px;
+ margin-left: 5rpx;
+}
+
+.p_swiper {
+ display: flex;
+}
+
+.p_swiper .un_line {
+ text-decoration: line-through;
+ font-size: 22rpx;
+ color: #b2a2c2;
+}
+
+.seckill-list view.co-red2 {
+ font-size: 22rpx;
+ color: #c2aebb;
+ margin-top: -8rpx;
+}
+
+.seckill-list view.cantuan {
+ width: 72rpx;
+ height: 36rpx;
+ text-align: center;
+ line-height: 36rpx;
+ position: absolute;
+ background: #e9030d;
+ color: #fff;
+ font-size: 18rpx;
+ bottom: 30rpx;
+ right: 10rpx;
+ z-index: 5;
+ border-radius: 5rpx;
+ padding: 0;
+}
+
+.arrow-right {
+ width: 24rpx;
+ height: 24rpx;
+}
+
+.pd-view {
+ height: 80rpx;
+}
+
+.xc-grow-ups {
+ margin-left: 8rpx;
+ margin-top: 6rpx;
+}
+
+.xc-top-img {
+ width: 100%;
+ top: -1rpx;
+ height: 315rpx;
+}
+
+.classify-frame {
+ line-height: 25rpx;
+}
+
+.slide-image-frame {
+ width: 95%;
+ margin: auto;
+ border-radius: 10rpx;
+}
+
+.xc-hook {
+ width: 52rpx;
+ height: 52rpx;
+}
+
+.margin-left {
+ margin-left: 10rpx;
+}
+
+.xc-class-img {
+ width: 83rpx;
+ height: 83rpx;
+}
+
+.xc-class-frame {
+ line-height: 40rpx;
+ margin-top: 40rpx;
+ margin-bottom: 20rpx;
+}
+
+.xc-title-img {
+ height: 220rpx;
+ width: 100%;
+ border-radius: 15rpx;
+}
+
+.title-img-frame {
+ width: 94%;
+ margin: auto;
+ margin-top: 30rpx;
+ padding-bottom: 10rpx;
+}
+
+.seckill-list {
+ line-height: 24rpx;
+}
+
+.seckill-lists {
+ line-height: 30rpx;
+}
+
+.xc-marfin-right {
+ margin-right: 8rpx;
+}
+
+.classname .clock-img {
+ width: 36rpx;
+ height: 36rpx;
+ margin-right: 10rpx;
+}
+
+.classname .seckill-ttitle-img {
+ width: 150rpx;
+ height: 40rpx;
+}
+
+.seckill-ttitle-img.height {
+ height: 35rpx;
+}
+
+.split-line {
+ width: 100%;
+ height: 10rpx;
+ background: #eee;
+}
+
+.mar-top10 {
+ margin-top: 10rpx;
+}
+
+.classname .user-img {
+ width: 30rpx;
+ height: 30rpx;
+ margin-left: 20rpx;
+ margin-right: 10rpx;
+}
+
+.user-frame {
+ /* border-left: 5rpx solid #eee; */
+ height: 35rpx;
+ line-height: 35rpx;
+ margin-left: 10rpx;
+}
+
+.user-name {
+ width: 66rpx;
+ border-left: 5rpx solid #eee;
+}
+
+/* 团购列表 */
+
+.kill-item {
+ display: flex;
+ justify-content: space-between;
+ background-color: #fff;
+ padding: 10rpx 10rpx;
+ margin-bottom: 10rpx;
+ border-radius: 10rpx;
+ height: 249rpx;
+ align-items: center;
+}
+
+.kill-pic {
+ width: 215rpx;
+ height: 215rpx;
+ position: relative;
+}
+
+.teamheight {
+ height: 289rpx;
+ border-bottom: 6rpx solid #eee;
+}
+
+.kill-cont {
+ width: 440rpx;
+ height: 215rpx;
+ margin-left: 16rpx;
+}
+
+.goods-name {
+ max-height: 60rpx;
+ font-size: 24rpx;
+ color: #555;
+ line-height: 55rpx;
+}
+
+.xc-team-img {
+ width: 38rpx;
+ height: 45rpx;
+ left: -1rpx;
+ top: -16rpx;
+}
+
+.tneirong {
+ color: #fff;
+ font-size: 20rpx;
+ border-radius: 20rpx;
+ padding-left: 32rpx;
+ padding-right: 15rpx;
+ padding-bottom: 2rpx;
+ height: 28rpx;
+ line-height: 28rpx;
+ white-space: nowrap;
+}
+
+.xc-people-val-frame {
+ border: 3rpx solid #d60021;
+ border-radius: 8rpx;
+ white-space: nowrap;
+ height: 28rpx;
+}
+
+.xc-people-val-frame .val-img {
+ width: 33rpx;
+ height: 28rpx;
+ border-radius: 8rpx;
+ margin-left: -2rpx;
+}
+
+.people-img {
+ width: 20rpx;
+ height: 20rpx;
+}
+
+.goods-num {
+ height: 50rpx;
+ display: flex;
+ justify-content: space-between;
+ margin-top: 10rpx;
+ font-size: 24rpx;
+ color: #999;
+}
+
+.xc-top15 {
+ padding-top: 15rpx;
+ margin-top: 25rpx;
+}
+
+.underline {
+ text-decoration: line-through;
+ color: #999;
+ font-size: 20rpx;
+ margin-left: 5rpx;
+ margin-top: 5rpx;
+}
+
+.navigator.navwidth {
+ width: 100%;;
+}
+
+.view.left {
+ padding: 0 5rpx;
+}
+
+/* 热门好物 */
+
+.title .China {
+ width: 100%;
+ margin-top: 10rpx;
+ margin-bottom: 10rpx;
+ line-height: 0rpx;
+}
+
+.title .China .line view {
+ width: 2rpx;
+}
+
+.title .China .line {
+ height: 40rpx;
+ color: rgb(51, 51, 51);
+}
+
+.title .China .line view {
+ border-left: 3rpx solid #000;
+ margin-left: 5rpx;
+}
+
+.title .China .line .one {
+ height: 23rpx;
+}
+
+.title .China .line .two {
+ height: 15rpx;
+}
+
+.title .China .line .three {
+ height: 18rpx;
+}
+
+.title .China .Recommend {
+ margin: 0rpx 20rpx;
+ font-size: 28rpx;
+ line-height: 39rpx;
+ font-weight: bold;
+}
+
+.title .english .silk {
+ width: 214rpx;
+ height: 2rpx;
+ background-color: #000;
+}
+
+.title .english .esh {
+ margin: 0rpx 15rpx;
+}
+
+.collects {
+ margin-top: 40rpx;
+}
+
+.hang {
+ width: 100%;
+ margin: auto;
+ padding-left: 21rpx;
+}
+
+.hang .collect {
+ width: 347rpx;
+ height: 571rpx;
+ border-radius: 25rpx;
+ border: 1rpx solid rgb(214, 214, 214);
+ overflow: hidden;
+ margin-right: 14rpx;
+ margin-bottom: 5rpx;
+}
+
+.collect .bottom {
+ padding: 0rpx 20rpx;
+}
+
+.collect .sp {
+ width: 100%;
+ height: 326rpx;
+}
+
+.collect .money {
+ margin-top: 60rpx;
+ margin-bottom: 18rpx;
+ line-height: 28rpx;
+ align-items: baseline;
+}
+
+.collect .money view {
+ line-height: 28rpx;
+}
+
+.collect .money .flex {
+ font-weight: bold;
+}
+
+.collect .money .flex .fs24 {
+ padding-top: 5rpx;
+}
+
+.collect .Discount {
+ width: 156rpx;
+ height: 28rpx;
+ border-radius: 20rpx;
+ background-color: rgb(56, 56, 56);
+ font-size: 18rpx;
+ color: rgb(255, 255, 255);
+}
+
+.collect .Discount image {
+ height: 18rpx;
+ width: 18rpx;
+ line-height: 28rpx;
+ margin-right: 3rpx;
+}
+
+.collect.ml20 {
+ margin-left: 13rpx;
+}
+
+.fs24.dollar {
+ padding: 0rpx;
+}
+
+.money .price {
+ margin-left: 12rpx;
+ text-decoration: line-through;
+ line-height: 23rpx;
+}
+
+.province {
+ line-height: 26rpx;
+}
+
+.nothing {
+ height: 75rpx;
+ width: 100%;
+}
+
+.nothing .no_content {
+ margin: 0rpx 11rpx;
+ color: rgb(138, 138, 138);
+}
+
+.nothing .Foil {
+ width: 80rpx;
+ height: 2rpx;
+ background-color: rgb(138, 138, 138);
+}
+
+.goods_name {
+ height: 70rpx;
+ margin-top: 6rpx;
+}
+
+.seckill-list view.translation {
+ width: 108rpx;
+ height: 20rpx;
+ border-radius: 20rpx;
+ background: #dfdfdf;
+ margin: auto;
+ line-height: 20rpx;
+}
+
+.seckill-list view.spot {
+ width: 10rpx;
+ height: 10rpx;
+ padding: 0rpx;
+}
+
+.spot {
+ width: 10rpx;
+ height: 10rpx;
+ padding: 0rpx;
+}
+
+.translation {
+ width: 108rpx;
+ height: 20rpx;
+ border-radius: 20rpx;
+ background: #e0e0e0;
+ line-height: 20rpx;
+ bottom: 45rpx;
+ left: 43%;
+}
+
+.translation {
+ width: 108rpx;
+ height: 20rpx;
+ border-radius: 20rpx;
+ background: #b8d1d6;
+ line-height: 20rpx;
+ bottom: 12rpx;
+ left: 43%;
+}
+
+.translations {
+ width: 108rpx;
+ height: 20rpx;
+ border-radius: 20rpx;
+ background: #dfdfdf;
+ line-height: 20rpx;
+ bottom: 25rpx;
+ left: 43%;
+}
+
+.mar-top {
+ margin-top: 20rpx;
+}
+
+.mar-tops {
+ margin-top: 10rpx;
+}
+
+.pt_active {
+ animation: sport 0.5s;
+}
+
+@keyframes sport {
+ 0% {
+ transform: translateY(80rpx);
+ opacity: 0;
+ }
+
+ 100% {
+ transform: translateY(0rpx);
+ opacity: 1;
+ }
+}
+
+.m-left {
+ margin-left: 18rpx;
+}
+
+.martop4 {
+ margin-top: 4rpx;
+}
+
+.time-blue {
+ margin-left: 10rpx;
+}
+
+.is_seckill_height {
+ height: 40rpx;
+ line-height: 32rpx;
+}
+
+.assemble-top-border {
+ border-top: 10rpx solid #eee;
+ padding-top: 20rpx;
+ margin-top: 0rpx;
+}
+
+.gonju {
+ max-width: 120rpx;
+}
+
+.disgraceful {
+ position: fixed;
+ width: 100%;
+ height: 100%;
+ left: 0rpx;
+ bottom: 0rpx;
+ background-color: rgba(182, 174, 174, 0.753);
+ z-index: 10;
+}
+
+.newreceive {
+ position: fixed;
+ width: 100%;
+ height: 100%;
+ z-index: 11;
+}
+
+.receive {
+ width: 570rpx;
+ height: 750rpx;
+}
+.close{
+ width: 70rpx;
+ height: 70rpx;
+ margin-top: 30rpx;
+}
+.swiper{
+ height: 250rpx;
+ padding-bottom:30rpx;
+}
+.container{ overflow: hidden;}
+
+.xc-recommend-goods {
+ width: 100%;
+ height: 73rpx;
+ margin: auto;
+}
+
+.xc-small {
+ width: 10rpx;
+ height: 10rpx;
+ background: #ff5f80;
+ margin-top: 6rpx;
+}
+
+.xc-zhong {
+ width: 15rpx;
+ height: 15rpx;
+ background: #ff5f80;
+ margin-left: 12rpx;
+ margin-top: 2rpx;
+}
+
+.xc-big {
+ width: 17rpx;
+ height: 17rpx;
+ background: #ff5f80;
+ margin-left: 15rpx;
+}
\ No newline at end of file
diff --git a/pages/cart/cart4/cart4.js b/pages/cart/cart4/cart4.js
deleted file mode 100644
index eb40940..0000000
--- a/pages/cart/cart4/cart4.js
+++ /dev/null
@@ -1,102 +0,0 @@
-var r = getApp(), e = r.request,rq=e,oo=r.globalData,os=oo.setting, t = require("../../../utils/pay.js");
-require("../../../utils/util.js");
-
-Page({
- data: {
- url: r.globalData.setting.url,
- resourceUrl: r.globalData.setting.resourceUrl,
- imgUrl: r.globalData.setting.imghost,
- order: {},
- type:2,
- is_pt:0,
- pt_order_sn:"",
- },
- onLoad: function(r) {
- console.log("onLoad");
- var t = this,th=t, data = null, order_m=0;
- //----正常单1 和 组合单2---
- if(r.type==1){
- data = { order_sn: r.order_sn, store_id: os.stoid, order_status:0};
- t.setData({ type:1});
- }else{
- data = { parent_sn: r.order_sn, store_id: os.stoid, order_status: 0};
- }
-
- /*-----读取订单信息-----*/
- rq.get("/api/weshop/order/page",{
- data:data,
- success:function(rs){
-
- if(rs.data.code==0 && rs.data.data && rs.data.data.pageData && rs.data.data.pageData.length>0){
- //支付的金额
- rs.data.data.pageData.forEach(function(ie,ind){
- order_m+=ie.order_amount;
- })
- t.setData({
- order: {
- order_sn: r.order_sn, order_amount: order_m,
- }
- });
-
- //如果是拼单就不做处理
- if(rs.data.data.pageData[0].pt_prom_id>0) {
- th.data.pt_order_sn=rs.data.data.pageData[0].order_sn; th.data.is_pt=1;
- t.setData({ type:1});
- return false;
- }
- //如果是只有一单的情况下,就是单号=组合单号
- if(rs.data.data.pageData[0]['order_sn']==rs.data.data.pageData[0]['parent_sn']){
- t.setData({ type:2});
- }
- }
- }
- })
-
- /*-------
- r.order_sn ? e.get("/api/weshop/order/get/{store_id}/{order_id}", {
- data: {
- order_sn: r.order_sn
- },
- failRollback: !0,
- success: function(e) {
- var a = e.data.result.order_amount;
- parseFloat(a) < .01 && t.jumpSuccess(), t.setData({
- order: {
- order_sn: r.order_sn,
- order_amount: a
- }
- });
- }
- }) : (parseFloat(r.order_amount) < .01 && this.jumpSuccess(), this.setData({
- order: r
- }));--------*/
- },
- payment: function() {
- var r = this,th=r;
- this.data.order && parseFloat(this.data.order.order_amount) < .01 ? this.jumpSuccess() : t.pay(this.data.order.order_sn, function() {
- r.jumpPaymentPage();
- },null,os.stoid,th.data.type);
- },
- jumpSuccess: function() {
- r.showSuccess("下单成功", function() {
- var r = getCurrentPages();
- "pages/cart/cart/cart" == r[r.length - 2].route ? wx.redirectTo({
- url: "/pages/user/order_list/order_list?type=2"
- }) : (wx.setStorageSync("order:order_list:update", !0), wx.setStorageSync("order:order_detail:update", !0),
- wx.navigateBack());
- });
- },
- jumpPaymentPage: function() {
- wx.setStorageSync("order:order_list:update", !0);
- if(this.data.is_pt==1){
- wx.redirectTo({
- url: "/packageG/pages/team/team_success/team_success?ordersn=" + this.data.pt_order_sn,
- });
-
- }else {
- wx.redirectTo({
- url: "/packageG/pages/payment/payment/payment?order_sn=" + this.data.order.order_sn + "&order_amount=" + this.data.order.order_amount
- });
- }
- }
-});
diff --git a/pages/cart/cart4/cart4.json b/pages/cart/cart4/cart4.json
deleted file mode 100644
index 3100f9f..0000000
--- a/pages/cart/cart4/cart4.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "navigationBarTitleText": "支付",
- "usingComponents": {
- "warn": "/components/long_warn/long_warn"
- }
-}
\ No newline at end of file
diff --git a/pages/cart/cart4/cart4.wxml b/pages/cart/cart4/cart4.wxml
deleted file mode 100644
index 7558884..0000000
--- a/pages/cart/cart4/cart4.wxml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
- 订单号
- {{order.order_sn}}
-
-
- 订单金额
- {{order.order_amount}}元
-
-
-
- 支付方式
-
-
-
-
- 微信支付
-
- 立即支付
-
-
-
-
diff --git a/pages/cart/cart4/cart4.wxss b/pages/cart/cart4/cart4.wxss
deleted file mode 100644
index 401667c..0000000
--- a/pages/cart/cart4/cart4.wxss
+++ /dev/null
@@ -1,49 +0,0 @@
-.order-list {
- margin-bottom: 20rpx;
-}
-
-.order-list>view {
- display: flex;
- justify-content: space-between;
- align-items: center;
- height: 96rpx;
- font-size: 32rpx;
- color: #444;
-}
-
-.title {
- height: 70rpx;
- line-height: 70rpx;
- font-size: 32rpx;
- color: #444;
-}
-
-.pay-way {
- padding-bottom: 150rpx;
-}
-
-.pay-item {
- display: flex;
- height: 100rpx;
- align-items: center;
- border-bottom: 1px solid #f5f5f5;
- font-size: 28rpx;
- color: #444;
-}
-
-.pay-img {
- width: 60rpx;
- height: 52rpx;
- margin: 0 20rpx;
-}
-
-.pay-now {
- width: 680rpx;
- height: 88rpx;
- line-height: 88rpx;
- text-align: center;
- margin: 150rpx auto 0;
- background-color: #f23030;
- color: #fff;
- border-radius: 10rpx;
-}
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 2af60b2..a4664d2 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -7721,6 +7721,16 @@ Page({
if (!item) return false;
+ if (item.is_no_dis_nor || (item.is_no_dis_act && !th.data.is_normal)){
+ wx.showToast({
+ title: "该门店不可售,请选择其他门店",
+ icon: 'none',
+ duration: 2000
+ });
+ return false;
+ }
+
+ if (!th.data.sele_g) return false;
//判断门店的配送方式是不是匹配
var g_distr_type = th.data.sele_g.distr_type;
if (item.distr_type != 0 && g_distr_type != 0 && item.distr_type != g_distr_type) {
diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index 206976b..b30e22c 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -282,7 +282,7 @@ Page({
arr[i].content=content;
- //--送礼包--
+ //--送券--
if(parseInt(content.is_coupon)) {
//-- 获取 --
await getApp().request.promiseGet("/api/weshop/prom/coupon/get/"+content.coupon, {
diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js
index 1281fa6..9121d16 100644
--- a/pages/team/team_show/team_show.js
+++ b/pages/team/team_show/team_show.js
@@ -1,1705 +1,10 @@
-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 regeneratorRuntime = require('../../../utils/runtime.js');
-
-
Page({
- data: {
-
- num: 1, //输入框值 加减之间的值
- minusStatus: 'disable', //禁用按钮
- ii_endname: 'disable', //吐司的禁用按钮
- pd_xx: false, //弹框
- buy_start_date: null, //转换完的时间
- ssl: null,
- yijian: false, //一键参加按钮显示隐藏
-
- //选择门店
- qh: true, //取货
- xz: false, //选择
- one: false, //第一层显示隐藏
- se: false, //已选择的值
- list: false, //第二层显示隐藏
- ssl_child: null, //第二层的值
- sele_dl_name: "", //选择的值
- end_name: "", //最后显示的值
-
- ii: 0, //选择门店显示隐藏
- zk: true, //展开列表显示隐藏
- stoid: o.stoid,
- hiddenName: false, //收起列表显示隐藏
- teamlist: null, //活动主表
- teamgroup: null, //活动从表
- goods: null, //商品数据
- pindGoods: null, //拼单数据
- imageurl: os.imghost, //有礼派图片地址
- team_id: 0, //支付是否成功
- listno: "", //订单编号
-
- //选择的门店id
- pick_id:0,
- //会员团满团时的判断
- tg_arr:null,
- //是否显示
- is_show:0,
- //是不是团结束
- is_group_end:0,
- //团结束的提示语句
- end_text:"",
- //是开团或者参团,0参团,1开团(但是,商家团还是参团)
- is_kt_or_ct:0,
- //判断redis的数组
- redis_arr:null,
-
- iurl:os.imghost,
-
-
- openSpecModal: !1,
- openSpecModal_pt: !1, //拼单的弹起,
-
-
- //门店相关
- ismend: 0,
- is_sec_mend: 0,
- sto_sele_name: "", //选中的门店名称
- sto_sele_id: "", //选中的门店id
- sto_sele_distr: "", //选择的门店的配送方式
- is_show_sto_cat: 1, //是否显示门店分类
- only_pk: null,
- all_sto: null,
- sec_sto: null, //选择了的门店分类
- pickpu_list: null, //读出的所有门店list
- def_pickpu_list: null, //一开始5个门店list
- sec_pick_index: 0, //第二级门店选择ID
- fir_pick_index: 0, //第一级门店选择ID
- all_pick_list:null,//所有的门店先记录起来
- bconfig:null,
- def_pick_store: null, // 默认的门店
- fir_def_store:null, //客户默认的门店的
- lat: null, //维度
- lon: null, //经度
-
- is_get_local_ok: 0, //获取坐标是否完成
-
- sort_store: 0, //门店分类
- choice_sort_store: 0, //选择分类门店
- template_id:[],//订阅消息id
- },
+ data: {},
onLoad: async function(options) {
- wx.setNavigationBarTitle({ title: "拼团订单",})
- //var postdata=getApp().globalData.to_group;
- var postdata=options;
- var tg_id = postdata.tg_id, first_leader=options.first_leader,goods_id=options.goods_id;
- //如果tg_id是空的话
- if(tg_id==null ||goods_id==null){
- var tg_id_str=decodeURIComponent(postdata.scene);
- tg_id_str=tg_id_str.split("_");
- console.log(tg_id_str.length);
- //tg_id_str[0] teamgroup.id tg_id_str[1] user_id tg_id_str[2] goods_id
- switch(tg_id_str.length){
- case 1:
- tg_id=tg_id_str[0];
- break;
- case 2:
- tg_id=tg_id_str[0];
- first_leader=tg_id_str[1];
- break;
- case 3:
- tg_id=tg_id_str[0];
- first_leader=tg_id_str[1];
- goods_id=tg_id_str[2];
- break;
- }
- }
- //--判断一下是不是导购--
- if(first_leader){
- getApp().globalData.first_leader=first_leader;
- //调用接口判断是不是会员
- getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{
- if(res.data.code==0){
- getApp().globalData.guide_id=res.data.data.id;
- getApp().globalData.guide_pick_id= res.data.data.pickup_id
- }
- })
- }
- this.setData({tg_id: tg_id,goods_id});
- getApp().globalData.to_group=null;
-
- var th=this;
- getApp().getConfig2(function(e) {
- var json_d = JSON.parse(e.switch_list);
- th.setData({ bconfig: e,sys_switch:json_d});
- th.wait_for_store_config(); //获取默认的门店
- })
- try {
- let template_id =await getApp().get_template_id('1023')
- this.setData({
- template_id
- })
- } catch (error) {}
-
+ getApp().globalData.ts_trans_data=options;
+ getApp().goto('/packageG/pages/team/team_show/team_show?transfer=1');
},
-
//显示加载
- onShow:function(){
- //-- 看一下隐私政策要不要显示 --
- var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
- if (privacy_pop) {
- privacy_pop.check_pri_show();
- }
-
- getApp().check_can_share();
- var tg_id = this.data.tg_id,th=this;
- this.init(tg_id);
- },
-
- //c点击打开拼团弹窗
- cpd: function() {
- this.setData({ pd_xx: true,})
- },
-
- //点击关闭拼团弹窗
- close_pt_xx: function() {
- this.setData({ pd_xx: false, })
- },
- //天天拼团订阅消息提醒
- sendsm: function (ee) {
- let th = this;
- var template_id = this.data.template_id;
- // //授权订阅
- wx.requestSubscribeMessage({
- tmplIds: template_id,
- success(res) {
- th.cyijian(ee);
- },
- fail(res) {
- th.cyijian(ee);
- }
- })
- },
- //按钮点击一键参加团按钮
- cyijian: function(e) {
- //--先判断会员状态--
- var user_info=getApp().globalData.userInfo;
- if(user_info==null || user_info.mobile==undefined || user_info.mobile=="" || user_info.mobile==null){
- wx.navigateTo({ url: '/packageE/pages/togoin/togoin', })
- return false;
- }
-
- var is_kt_or_ct=e.currentTarget.dataset.isct;
- this.setData({
- yijian: true,is_kt_or_ct:is_kt_or_ct,
- })
- },
- //关闭展开列表
- click: function(e) {
- this.setData({
- hiddenName: !this.data.hiddenName,
- zk: !this.data.zk,
- })
- },
- //打开收起拼团列表
- czk: function(e) {
- this.setData({
- zk: !this.data.zk,
- hiddenName: !this.data.hiddenName,
- })
- },
- //关闭购买页面
- cbcou: function(e) {
- this.setData({
- yijian: false,
- })
-
- },
- //qh点击取货
- cqh: function(e) {
- if(this.data.ssl) {
- this.setData({
- qh: false,
- xz: true,
- one: true,
- })
- }else{
- this.setData({
- qh: false,
- xz: true,
- one: false,
- list:1,
- })
- }
-
- },
-
- //cxz点击选择门店
- cxz: function(e) {
- this.setData({
- qh: true,
- xz: false,
- one: false,
- })
- },
- //ccc点击选择的
- sel: function(e) {
- this.setData({
- list: false,
- se: false,
- one: true,
- xz: true,
- })
- },
- //list点击底二层
- clist: function(e) {
- var i = e.currentTarget.dataset.end;
- var pick_id = e.currentTarget.dataset.pick_id;
- var pick_dis = e.currentTarget.dataset.pick_dis;
-
- this.setData({
- end_name: i,
- pick_id: pick_id,
- ii: 1,
- qh: true,
- se: false,
- list: false,
- pick_dis: pick_dis
- })
- },
-
- //点击第一层
- setchild: function(e) {
- var ind = e.currentTarget.dataset.bindex;
- var nn = e.currentTarget.dataset.bname;
- console.log(nn);
- var list = this.data.ssl[ind].s_arr;
- this.setData({
- ssl_child: list,
- sele_dl_name: nn,
- xz: false,
- one: false,
- list: true,
- se: true
- });
- },
-
- //事件处理函数
- /*点击减号*/
- bindMinus: function() {
- var num = this.data.num;
- if (num > 1) {
- num--;
- }
- var minusStatus = num > 1 ? 'normal' : 'disable';
- this.setData({
- num: num,
- minusStatus: minusStatus,
- })
- },
-
- /*点击加号*/
- bindPlus: function() {
- var th=this;
- var num = this.data.num;
- var ii = this.data.ii;
- var minusStatus = num > 1 ? 'normal' : 'disable';
-
- num++;
- //要判断库存数量,限购数量
- th.check_num(num,minusStatus);
-
- },
-
- async check_num(num,minusStatus){
-
- var gd=this.data.goods;
- var th=this;
- var user_id=getApp().globalData.user_id;
- var promgoodsbuynum=0;
- var goodsbuynum=0;
- getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
- data: {
- store_id: os.stoid,
- user_id: user_id,
- goods_id: gd.goods_id,
- prom_type: gd.prom_type,
- prom_id: gd.prom_id, isnew:1
-
- },
- }).then(res=>{
- var buy_num_data=res.data.data;
- if(buy_num_data.promgoodsbuynum) promgoodsbuynum=buy_num_data.promgoodsbuynum;
- goodsbuynum=buy_num_data.goodsbuynum;
- })
-
- //先判断限购
- if (num+goodsbuynum>gd.viplimited && gd.viplimited>0) {
- getApp().confirmBox("超出商品限购");
- return false;
- }
- if (num+promgoodsbuynum>th.data.teamlist.buy_limit && th.data.teamlist.buy_limit>0) {
- getApp().confirmBox("超出活动限购");
- return false;
- }
- //判断库存
- if ( num>gd.store_count) {
- getApp().confirmBox("超出商品库存");
- return false;
- }
- var r_num=0;
- await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/6/" + th.data.teamlist.id, {
- 1: 1
- }).then(res => {
- var em = res;
- if (em.data.code == 0) {
- r_num=em.data.data;
- }
- })
- //--判断库存---
- if ( num>r_num) {
- getApp().confirmBox("超出商品库存");
- return false;
- }
-
- this.setData({
- num: num,
- minusStatus: minusStatus,
- })
-
- },
-
- /*输入框事件*/
- bindManual: function(e) {
- var num = e.detail.value;
- var minusStatus = num > 1 ? 'normal' : 'disable';
- this.setData({
- num: num,
- minusStatus: minusStatus
- })
- },
-
- //---------------初始化代码----------------
- async init(tg_id) {
- var goods_id = 0, //商品ID,
- pageteam = null, //
- original_img = null, //商品图片
- ee = this,
- ordertx = [],
- teamlist = null, //活动表
- goods = null, //商品
- teamgroup = null, //活動从表
- max_num = 0,
- min_price = 0,
- th=this,
- that=th,
- flag=null;
- await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/2",{
- data:{
- store_id: os.stoid,
- is_end: 0,
- is_show: 1,
- user_id: getApp().globalData.user_id,
- pageSize:1000
- }
- }).then(res=>{
- let pd_list=res.data.data.pageData;
- if(res.data.code==0 && pd_list.length>0){
- flag =pd_list.some(pd=>{
- // if(th.data.goods_id){
- return pd.goods_id==th.data.goods_id;
- // }
- })
- }
- })
- if(!flag){
- wx.showToast({title: "当前会员身份不符,无法参与", icon: 'none', duration: 3000});
- setTimeout(function () {
- ut.wx_back();
- }, 1000)
- return false;
- }
-
- //获取活动从表信息team_id,listno团编号(券号)
- await getApp().request.promiseGet("/api/weshop/teamgroup/get/"+os.stoid+"/"+tg_id, {
- }).then(res => {
-
- if(res.data.code !=0 ){
- getApp().showWarning(res.data.msg);
- th.go_back();
- return false;
- }
-
- if(res.data && res.data.data ) {
-
- teamgroup = res.data.data;
- //获取当前时间,并且判断剩余时间
- var nt = ut.gettimestamp();
- var buy_start_date = ut.formatTime(teamgroup.buy_start_date, "yyyy-MM-dd hh:mm:ss");
- ee.setData({
- pindGoods: teamgroup,
- buy_start_date: buy_start_date
- });
-
- if(nt>teamgroup.kt_end_time) {
- th.setData({is_group_end:1,end_text:"团期已经结束"})
- }
- if(teamgroup.state==1) {
- th.setData({is_group_end:1,end_text:"团期已经结束"})
- }
- if(teamgroup.state==3 || teamgroup.state==4 || teamgroup.state==5 ) {
- th.setData({is_group_end:2,end_text:"团期已满"})
- }
-
- }
- })
-
- if(!teamgroup || !teamgroup.listno){
- ut.m_toast('未找到团号');
- th.go_back();
- return false;
- }
-
- //判断是不是要继续的开关
- var is_ok=1;
-
- //要先读取订单,看自己有没有买过该团的商品
- await getApp().request.promiseGet("/api/weshop/order/page", {
- data: {
- pt_prom_id:teamgroup.team_id,
- user_id: oo.user_id,
- store_id: os.stoid,
- pageSize: 1,
- page: 1
- }
- }).then(res => {
- var e=res;
- if (e.data.code != 0) {
- getApp().showWarning("读取订单失败");
- th.go_back();
- is_ok=0;
- return fasle;
- }
- //--跳转到已经购买的情况--
- if (e.data.data.pageData.length > 0) {
- var odr = e.data.data.pageData[0];
- //还未支付
- if (odr.pt_status == 0 && odr.order_status == 1) {
- wx.navigateTo({
- url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id,
- });
- is_ok=0;
- }else if (odr.pt_status == 1 && odr.order_status == 1){
- wx.navigateTo({
- url: "/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn,
- });
- is_ok=0;
- }
- }
- })
- if(!is_ok) return false;
-
- //获取活动表的信息根据活动team_id
- await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + teamgroup.team_id, {
- data: {}
- }).then(res => {
- if (res.data.code == 0) {
- teamlist = res.data.data;
- goods_id = res.data.data.goods_id;
- //----------查看阶梯团------------
- if (teamlist.ct_rylist != "" && teamlist.ct_rylist != null && teamlist.ct_rylist != undefined) {
- var ct_rylist = JSON.parse(teamlist.ct_rylist);
- var max = 0; var pri = 0;
- ct_rylist.forEach(function (val, ind) {
- if (val.rynum > max) {
- max = val.rynum;
- pri = val.price;
- }
- })
- max_num = max;
- min_price = pri;
- }
-
- }
- })
-
- if(!teamlist){
- getApp().showWarning("未找到活动");
- is_ok=0;
- }else{
- if(teamlist.is_end==1){
- getApp().showWarning("拼单活动已经结束"); is_ok=0;
- }
- var now=ut.gettimestamp();
- if(teamlist.end_time {
- ordertx = res.data.data.pageData;
- })
-
- //获取商品信息
- await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, {
- }).then(res => {
- //商品地址
- original_img = ee.data.imageurl + res.data.data.original_img,
- goods = res.data.data
- })
-
- //显示商品规格
- var gg = "";
- if(goods.goods_spec=="null" || goods.goods_spec==null ) goods.goods_spec="";
- if(goods.goods_color=="null" || goods.goods_color==null) goods.goods_color="";
-
- if (goods.goods_spec != "" && goods.goods_color != "") {
- gg = goods.goods_spec + "/" + goods.goods_color;
- } else if (goods.goods_spec != "" || goods.goods_color != "") {
- gg = goods.goods_spec + goods.goods_color;
- } else {
- gg = "规格1";
- }
- goods.gg = gg;
-
- //只装5个
- var ordertx2 = [], sf_num = 0, ct_nun = teamlist.ct_num;
- if (max_num) {
- ct_nun = parseInt(max_num);
- if (ct_nun < ordertx.length) ct_nun = ordertx.length;
- }
-
- if (ct_nun > 5) ct_nun = 5;
- for (var i = 0; i < ct_nun; i++) {
- if (i >= ordertx.length) sf_num++
- else
- ordertx2.push(ordertx[i]);
- }
-
- var sf_arr = [];
- for (var i = 0; i < sf_num; i++) {
- sf_arr.push(i);
- }
-
-
-
- if(th.data.is_group_end==1 || th.data.is_group_end==2 ){
- getApp().confirmBox(th.data.end_text);
- wx.redirectTo({
- url: "/pages/goods/goodsInfo/goodsInfo?goods_id=" + goods.goods_id,
- });
- return false;
- }
-
- //--当是会员团的时候才显示倒计时多久可以参团--
- if(teamlist.kttype==2) {
- //显示判断多久才能购买商品,获取没有支付的会员
- await getApp().request.promiseGet("/api/weshop/teamgroup/getTeamUser/" + os.stoid + "/" + teamgroup.id, {
- 1: 1
- }).then(res => {
- var em = res;
- if (em.data.code == 0) {
- var tg_list = em.data.data.split("|");
- var t_obj = {};
- t_obj.order_id = tg_list[0];
- t_obj.time = parseFloat(tg_list[1]) + 5 * 60; //五分钟后
- t_obj.user_name = tg_list[2];
- th.setData({tg_arr: t_obj})
- }
- })
- }
-
- //获取大家都在团信息
- await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/"+os.stoid, {
- data: {
- pageSize: 2,
- page: 1,
- store_id: 1,
- is_end: 0,
- is_show: 1
- }
- }).then(res => {
- if(ut.ajax_ok(res)){
- pageteam = res.data.data.pageData;
- }
- });
-
- //-- 获取用户的默认门店 --
- getApp().get_user_store(function(ee) {
- if(!ee) {
- th.data.fir_def_store={}; //赋值空对象
- return false;
- }
-
- if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
- //--定时器推迟一下--
-
- var appd=getApp().globalData;
- var w_time = setInterval(function() {
- if (that.data.is_get_local_ok == 0) return false;
- if(!th.data.goods) return false;
- var g_distr_type=th.data.goods.distr_type;
- //--如果默认门店的配送方式不对,就不能被选择--
- if(ee.distr_type!=0 && g_distr_type!=0 && ee.distr_type!=g_distr_type ){
- //th.data.fir_def_store={}; //赋值空对象
- //return false;
- ee.is_no_dis=1;
- }
-
- clearInterval(w_time);
-
- var distance = null;
- var e=JSON.parse(JSON.stringify(ee));
-
- //如果有开启近距离的话,同时距离优不一样了
- if (that.data.lat != null) {
- //如果经纬度有变化的话
- if( appd.lat==that.data.lat && appd.lon==that.data.lon && e.distance>0 ){
- that.data.fir_def_store=e;
- that.setData({
- def_pick_store: e,
- sto_sele_name: e.pickup_name,
- sto_sele_id: e.pickup_id,
- sto_sele_distr: e.distr_type
- })
- }else{
- //要用接口是获取距离,js的计算不准
- getApp().request.promiseGet("/api/weshop/pickup/list",{
- data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon,is_pos: 1},
- }).then(res=>{
- if(ut.ajax_ok(res)){
- e=res.data.data.pageData[0];
- if (e){
- appd.pk_store=e;
- that.data.fir_def_store=e;
- that.setData({
- def_pick_store: e,
- sto_sele_name: e.pickup_name,
- sto_sele_id: e.pickup_id,
- sto_sele_distr: e.distr_type
- })
- }
-
- }
- })
- }
-
- //e.distance = distance;
- appd.lat=that.data.lat;
- appd.lon=that.data.lon;
-
- }else{
- if (e) {
- e.distance = null;
- that.data.fir_def_store=e;
- that.setData({
- def_pick_store: e,
- sto_sele_name: e.pickup_name,
- sto_sele_id: e.pickup_id,
- sto_sele_distr: e.distr_type
- })
- }
- }
-
- }, 500)
-
- });
-
- //获取下redis长度,如果团已经弄完,或者拼单已经卖完
- //设置值
- ee.setData({
- ordertx2: ordertx2,
- ordertx: ordertx,
- teamlist: teamlist,
- teamgroup: teamgroup,
- goods: goods,
- pageteam: pageteam,
- image: original_img,
- is_show:1,
- sf_arr: sf_arr
- });
- ee.countDown2();
- //---设置门店---
- ee.get_sto();
- //---定时设置一下待支付的订单---
- ee.time_out();
- },
-
- onHide:function(){
- this.setData({is_show:0,});
- },
- go_back:function(){
- if(getCurrentPages()>1)
- wx.navigateBack({delta: 1})
- else
- wx.navigateTo({
- url: "/pages/index/index/index"
- });
- },
- //---小于10的格式化函数----
- timeFormat(param) {
- return param < 10 ? '0' + param : param;
- },
- countDown2() {
- var th = this;
- // 获取当前时间,同时得到活动结束时间数组
- var newTime = ut.gettimestamp();
- var o = this.data.pindGoods;
- var endTime = o.kt_end_time;
-
- let obj = null;
- // 如果活动未结束,对时间进行处理
- if (endTime - newTime > 0) {
- let time = (endTime - newTime);
- // 获取天、时、分、秒
- let day = parseInt(time / (60 * 60 * 24));
- let hou = parseInt(time % (60 * 60 * 24) / 3600);
- let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
- let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
- obj = {
- day: this.timeFormat(day),
- hou: this.timeFormat(hou),
- min: this.timeFormat(min),
- sec: this.timeFormat(sec)
- }
- } else {
- //活动已结束,全部设置为'00'
- obj = {
- day: '00',
- hou: '00',
- min: '00',
- sec: '00'
- }
- }
- var txt = "pindGoods.djs";
- th.setData({
- obj: obj
- });
- setTimeout(th.countDown2, 1000);
- },
-
- //------去支付,购买-------
- go_pay:function () {
- var th=this;
- var def_pick_store=this.data.def_pick_store;
- if(def_pick_store && def_pick_store.pickup_id) {
- th.data.pick_id=def_pick_store.pickup_id; //选择门店
- th.data.end_name=def_pick_store.pickup_name;
- }
- if (!th.data.pick_id) return s.my_warnning("请选择门店", 0, th);
- if (th.data.pick_id==0) return s.my_warnning("请选择门店", 0, th);
-
- //----判断起购数----
- var qnum=parseFloat(th.data.teamlist.minbuynum);
- if(qnum>0 && qnum>th.data.num ){
- getApp().confirmBox("拼团商品至少要买"+qnum+"件!");
- return false;
- }
- //先判断团的redis数量
- this.buy_check_redis(function () {
- var arr=th.data.redis_arr;
- if(th.data.num>arr[0]){
- if(arr[0]>0){
- getApp().showWarning("超出活动库存");
- }else{
- getApp().showWarning("拼单已经抢光");
- }
- return false;
- }
- if(th.data.teamlist.kttype==2 && 1>arr[1]){
- getApp().showWarning("拼团已满");
- return false;
- }
-
- //--------------此时操作的数据------------
- var newd = {
- goods_id: th.data.goods.goods_id,
- goods_num: th.data.num,
- pick_id: th.data.pick_id,
- user_id: oo.user_id,
- store_id: th.data.stoid,
- goods_name: th.data.goods.goods_name,
- goods_sn: th.data.goods.goods_sn,
- };
-
- //---是不是从收藏夹出来的---
- if(th.data.c_guide_id){
- newd['guide_id'] = th.data.c_guide_id;
- newd['guide_type']=2;
-
- }else{
- if(getApp().globalData.guide_id){
- newd['guide_id'] = getApp().globalData.guide_id;
- newd['guide_type']=0;
-
- }
- }
-
- //-----拼团-----
- newd.goods_price = th.data.teamlist.price;
- newd.prom_type = 6;
- newd.prom_id = th.data.teamlist.id;
- newd.kt_type = th.data.teamlist.kttype; //开团类型
- newd.is_pt_tz = 0;
- newd.pick_name = th.data.end_name;
- newd.pick_dis = 1;
- newd.is_normal = 0;
- //判断开团还是参团
- switch (th.data.is_kt_or_ct) {
- case "0":
- //如果不是商家团,就要带团期号
- if(th.data.teamlist.kttype>1){
- newd.qh=th.data.teamgroup.listno;
- }
- break;
- case "1":
- //阶梯团和会员团都要设置is_pt_tz
- if (newd.kt_type > 1) {
- newd.is_pt_tz = 1; //开团类型
- }
- break;
- }
- newd['pick_dis'] = th.data.pick_dis;
-
- if(getApp().globalData.guide_id){
- newd['guide_id'] = getApp().globalData.guide_id;
- newd['guide_type']=0;
- }
-
- s.set_b_now(newd);
- wx.navigateTo({
- url: "/packageE/pages/cart/cart2_pt/cart2_pt?is_bnow=1&goods_id=" + th.data.goods.goods_id,
- });
- });
- },
-
- //购买前的判断redis
- async buy_check_redis(func){
- //获取redis中的数量
- var r_num=0,prom_type=6,prom_id=this.data.teamlist.id;
- await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, {
- 1: 1
- }).then(res => {
- var em = res;
- if (em.data.code == 0) {
- r_num=em.data.data;
- }
- })
-
- //只有会员团要判断团的人数
- var gr_num=0,grp_id=this.data.teamgroup.id;
- if(this.data.teamlist.kttype==2){
- await getApp().request.promiseGet("/api/weshop/activitylist/getActTuanLen/" + os.stoid + "/" + grp_id, {
- 1: 1
- }).then(res => {
- var em = res;
- if (em.data.code == 0) {
- gr_num=em.data.data;
- }
- })
- }
- var arr=[];arr.push(r_num);arr.push(gr_num);
- this.data.redis_arr=arr;
- func();
- },
-
- //定时设置一下待支付的订单
- time_out:function () {
- var list=this.data.tg_arr,th=this;
- if(!list) return false;
- // 获取当前时间,同时得到活动结束时间数组
- var newTime = ut.gettimestamp();
- var endTime = list.time;
-
- let obj = null;
- // 如果活动未结束,对时间进行处理
- if (endTime - newTime > 0) {
- let time = (endTime - newTime);
- // 获取天、时、分、秒
- let day = parseInt(time / (60 * 60 * 24));
- let hou = parseInt(time % (60 * 60 * 24) / 3600);
- let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
- let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
- obj = {
- day: th.timeFormat(day),
- hou: th.timeFormat(hou),
- min: th.timeFormat(min),
- sec: th.timeFormat(sec)
- }
- } else {
- //活动已结束,全部设置为'00'
- obj = {
- day: '00',
- hou: '00',
- min: '00',
- sec: '00'
- }
-
- //调用接口清理订单,并且返回redis数量
- th.back_order(function () {
- th.setData({ tg_arr: null});
- });
- return false;
- }
- var txt = "pindGoods.djs";
- th.setData({
- r_obj: obj
- });
- setTimeout(th.time_out, 1000);
- },
-
- //清理订单,并且返回redis数量ss
- back_order:function (func) {
- var th=this;
- //---取消订单---
- getApp().request.delete("/api/weshop/order/cancelTeamOrder/"+th.data.stoid+"/"+th.data.tg_arr.order_id,{
- data:{},
- success: function(t) {
- if(t.data.code==0){
- th.setData({tg_arr:null})
- }
- },
- })
- },
-
- go_goodsinfo:function (e) {
- var gid=e.currentTarget.dataset.gid;
- var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gid;
- wx.navigateTo({ url: url, }) //跳到非tabbar页
- },
-
- gohome:function(){
- getApp().goto("/pages/index/index/index");
- },
-
- //-----图片失败,默认图片-----
- bind_bnerr: function (e) {
- var _errImg = e.target.dataset.errorimg;
- var _errObj = {};
- _errObj[_errImg] = this.data.iurl + "/miniapp/images/default_g_img.gif";
- this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
- },
-
- //------ 分享配置 --------
- onShareAppMessage: function (e) {
- getApp().globalData.no_clear=1;
- var curPage=this;
- var pagePath = curPage.route; //当前页面url
- if (pagePath.indexOf('/') != 0) {
- pagePath = '/' + pagePath;
- }
- var url=pagePath;
-
- //--分享图片--
- img=th.data.iurl+th.data.teamlist.share_imgurl;
- //--把会员分享出去--
- if(getApp().globalData.user_id){
- if(url.indexOf("?")>0)
- url+="&first_leader="+getApp().globalData.user_id;
- else
- url+="?first_leader="+getApp().globalData.user_id;
- }
-
- if(url.indexOf('goods_id')==-1){
- url+="&goods_id="+this.data.goods.goods_id;
- }
- if(url.indexOf('tg_id')==-1){
- url+="&tg_id="+this.data.teamgroup.id;
- }
-
-
- return {
- path:url,
- title: "商品分类",
- imageUrl: img,
- }
- },
-
-
-
-
-
- closeSpecModal: function() {
- this.setData({
- yijian: false
- });
- },
-
- close_popup: function() {
- this.setData({
- showStore: true
- });
- },
-
-
-
- //-- 选择门店。此时的门店选择与门店有关系 --
- choice_store: function(ee) {
-
- //--先判断会员状态--
- var user_info = getApp().globalData.userInfo;
- if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
- wx.navigateTo({
- url: '/packageE/pages/togoin/togoin',
- })
- return false;
- }
-
- var th = this;
- var bconfig = th.data.bconfig;
-
- //如果开启了,则不在选择门店
- if(this.data.sys_switch.is_pricing_open_store && getApp().globalData.pk_store){
- return false;
- }
-
- if(!th.data.only_pk && !th.data.def_pickpu_list){
- getApp().confirmBox("门店库存不足", null, 25000, !1);
- return false;
- }
- if(th.data.only_pk && !th.data.only_pk.length){
- getApp().confirmBox("门店库存不足", null, 25000, !1);
- return false;
- }
- if(th.data.def_pickpu_list && !th.data.def_pickpu_list.length){
- getApp().confirmBox("门店库存不足", null, 25000, !1);
- return false;
- }
-
- if ( bconfig && bconfig.is_sort_storage) {
- wx.getLocation({
- type: 'gcj02',
- success: function(res) {
-
- th.data.lat = res.latitude;
- th.data.lon = res.longitude;
- th.data.is_get_local_ok = 1;
- th.setData({
- is_gps: 1
- });
- //th.onShow();
- th.get_sto();
- },
- fail: function(res) {
- //th.onShow();
- th.data.is_get_local_ok = 1;
- th.get_sto();
- if (res.errCode == 2) {
- th.setData({
- is_gps: 0
- });
- if (th.data.is_gps == 0) {
- getApp().confirmBox("请开启GPS定位", null, 25000, !1);
- }
- } else {
- th.setData({
- is_gps: "3"
- });
- }
-
- }
- })
- }else{
- th.data.is_get_local_ok = 1;
- th.get_sto();
- }
-
- this.setData({
- store: 1,
- yijian: false,
- choice_sort_store:0
- })
-
- },
-
-
- //选择更多门店
- more_store: function() {
- this.setData({ sort_store: 1});
- },
-
- // 返回按钮
- returns: function() {
- this.setData({
- sort_store: 0,choice_sort_store: 0
- });
- },
-
-
- //-- 等待获取定位系统 --
- wait_for_store_config: function() {
- var th = this;
- var t_time = setInterval(function() {
- if (th.data.bconfig == null) false;
- var e = th.data.bconfig;
- if (e && e.is_sort_storage) {
- wx.getLocation({
- type: 'gcj02',
- success: function(res) {
- th.data.lat = res.latitude;
- th.data.lon = res.longitude;
- th.data.is_get_local_ok = 1;
- },
- fail: function(res) {
- if (res.errCode == 2) {
- th.setData({
- is_gps: 0
- });
- if (th.data.is_gps == 0) {
- getApp().confirmBox("请开启GPS定位", null, 10000, !1);
- }
-
- } else {
- th.setData({
- is_gps: "3"
- });
- }
-
- th.data.is_get_local_ok = 1;
- }
- })
- } else {
- th.data.is_get_local_ok = 1;
- }
- clearInterval(t_time);
- }, 500)
- },
-
-
- //---------拿出门店分类和门店------------
- get_sto(e) {
- var th = this,that=this;
- var timer_get = setInterval(function() {
- if (th.data.is_get_local_ok == 0) return false;
- if (!th.data.goods) return false;
- var dd = null,
- i = getApp().request;
- var g_distr_type = th.data.goods.distr_type;
- if (g_distr_type != 0) {
- dd = {
- store_id: o.stoid,
- distr_type: g_distr_type,
- isstop: 0,
- is_pos: 1,
- pageSize: 2000
- }
- } else {
- dd = {
- store_id: o.stoid,
- isstop: 0,
- is_pos: 1,
- pageSize: 2000
- }
- }
- //如果有距离的话
- if (th.data.lat != null) {
- dd.lat = th.data.lat;
- dd.lon = th.data.lon;
- }
- clearInterval(timer_get);
-
- //如果会员是有默认的门店话
- if(!th.data.def_pick_store && th.data.fir_def_store){
- th.setData({def_pick_store:th.data.fir_def_store});
- }
-
- //----------获取门店----------------
- getApp().request.promiseGet("/api/weshop/pickup/list", {
- data: dd,
- }).then(res => {
- var e = res;
- if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length>0) {
-
- var pickup_ids=null;
- //指定门店判断, 不是普通购买的时候,秒杀的时候,秒杀有指定门店
- if( th.data.teamlist.pick_up_lists){
- pickup_ids=th.data.teamlist.pick_up_lists
- }
-
- //-- 如果有指定门店的时候 --
- if(pickup_ids){
- var ok_arr=[];
- for (let i in e.data.data.pageData) {
- let ite = e.data.data.pageData[i];
- //-- 查找一下门店有没有在 --
- var idx=pickup_ids.findIndex(function (e){
- return e.pickup_id==ite.pickup_id;
- })
- if(idx>-1){
- ok_arr.push(ite)
- }
- }
-
- //判断会员的默认的门店是不是匹配指定的门店
- if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){
- //-- 查找一下门店有没有在 --
- var idx1=pickup_ids.findIndex(function (e){
- return e.pickup_id==th.data.def_pick_store.pickup_id;
- })
-
- if(idx1<0){
- th.data.def_pick_store.is_no_dis_act=1;
- }else{
- th.data.def_pick_store.is_no_dis_act=0;
- }
-
- that.setData({
- def_pick_store: th.data.def_pick_store
- })
-
- }
- e.data.data.pageData=ok_arr; //数组重新赋值
- e.data.data.total=ok_arr.length; //数组的长度
- }
- else{
- //-- 多规格指定门店优化 --
- if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){
- th.data.def_pick_store.is_no_dis_act=0;
- that.setData({
- def_pick_store: th.data.def_pick_store
- })
- }
- }
-
-
-
- var his_cate_num=0;
- for(let i in e.data.data.pageData){
- let item=e.data.data.pageData[i];
- if(item.category_id>0){
- his_cate_num=1;break;
- }
- }
- e.his_cate_num=his_cate_num;
-
- //如果有开启距离的功能,没有设置默认门店,要用最近的门店作为默认门店
- if(dd.lat && !th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage){
- th.setData({
- def_pick_store:e.data.data.pageData[0],
- sto_sele_name: e.data.data.pageData[0].pickup_name,
- sto_sele_id: e.data.data.pageData[0].pickup_id,
- sto_sele_distr: e.data.data.pageData[0].distr_type
- });
- th.data.fir_def_store=e.data.data.pageData[0];
- }
-
- //-- 如果有默认选择门店的时候,要把默认门店放在第一位 --
- if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store)!='{}'){
- for (var k = 0; k < e.data.data.pageData.length; k++) {
- if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
- e.data.data.pageData.splice(k, 1); //删除
- break;
- }
- }
- e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
- }
-
-
- th.setData({all_pick_list:e.data.data.pageData});
-
-
- setTimeout(function(){
- th.deal_pickup(e); //--普通门店排版--
- },800)
-
- }
- })
- }, 200)
-
- },
-
- //------------处理门店,拼团活动只有线上库存---------------
- deal_pickup(e){
- var th=this;
- var g_distr_type=th.data.goods.distr_type;
- //单总量超出5个的时候
- if (e.data.data.total > 10 && e.his_cate_num) {
- getApp().request.get("/api/weshop/storagecategory/page", {
- data: {
- store_id: o.stoid,
- pageSize: 1000,
- orderField:"sort",
- orderType:'asc',
- },
- success: function(ee) {
- if (ee.data.code == 0) {
-
- var check_all_cate=0;
- if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){
- for(let i in ee.data.data.pageData){
- let item=ee.data.data.pageData[i];
- if(item.is_show==1){
- check_all_cate=1;break
- }
- }
- }
-
-
-
- if (check_all_cate) {
-
- var sto_cate = ee.data.data.pageData;
- var sto_arr = e.data.data.pageData;
- var newarr = new Array();
- var qita = new Array();
-
- var is_del_pk=0;
- //----要进行门店分组--------
- for (var i = 0; i < sto_arr.length; i++) {
- //找一下这个门店有没有在分类数组内
- var find2 = 0,find2name = "",sort=0;
- is_del_pk=0;
- for (var m = 0; m < sto_cate.length; m++) {
- if (sto_arr[i].category_id == sto_cate[m].cat_id) {
- if(sto_cate[m].is_show!=1){
- is_del_pk=1; sto_arr.splice(i,1);
- i--;
- }else {
- find2 = sto_cate[m].cat_id;
- find2name = sto_cate[m].cat_name;
- sort = sto_cate[m].sort;
- is_del_pk=0;
- }
- break;
- }
- }
- if(is_del_pk) continue;
-
- if (newarr.length > 0) {
- var find = 0;
- //如果有找到,那门店就在这个分组内,否则,分类就要排在其他
- if (find2 != 0) {
- for (var ii = 0; ii < newarr.length; ii++) {
- if (sto_arr[i].category_id == newarr[ii].cat_id) {
- newarr[ii].s_arr.push(sto_arr[i]);
- find = 1;
- break;
- }
- }
- if (find == 0) {
- var arr0 = new Array();
- arr0.push(sto_arr[i]);
- var item = {
- cat_id: find2,
- name: find2name,
- sort:sort,
- s_arr: arr0
- };
- newarr.push(item);
- }
- } else {
- qita.push(sto_arr[i]);
- }
- } else {
- //如果有找到,那门店就在这个分组内,否则,分类就要排在其他
- if (find2 != 0) {
- var arr0 = new Array();
- arr0.push(sto_arr[i]);
- var item = {
- cat_id: find2,
- name: find2name,
- sort:sort,
- s_arr: arr0
- };
- newarr.push(item);
- } else {
- qita.push(sto_arr[i]);
- }
- }
- }
-
- var def_arr = new Array();
- //-- 开始就看10个门店 --
- for (var k = 0; k < 10; k++) {
- if (k == sto_arr.length) break;
- def_arr.push(sto_arr[k]);
- }
-
- th.setData({
- def_pickpu_list: def_arr,
- pickpu_list: ee.data.data.pageData
- });
-
- //门店分类要排序下
- function compare(property){
- return function(a,b){
- var value1 = a[property];
- var value2 = b[property];
- return value1 - value2;
- }
- }
- if(newarr.length>0)
- newarr.sort(compare("sort"));
-
-
- //----安排其他的分类-----
- if (qita.length > 0) {
- var item = {
- cat_id: -1,
- name: "其他",
- s_arr: qita
- };
- newarr.push(item);
- }
-
- var sd={
- all_sto: newarr,
- is_show_sto_cat:1
- }
- if(!sto_arr || sto_arr.length<=10){
- sd.is_show_sto_cat=-1;
- sd.only_pk=sto_arr;
- }
- th.setData(sd);
-
- } else {
- th.setData({
- is_show_sto_cat: -1,
- only_pk: e.data.data.pageData
- });
- //-----如果没有默认门店,要取第一个门店作为默认店.此时没有门店分类的情况------
- if (!th.data.def_pick_store) {
- th.setData({def_pick_store:e.data.data.pageData[0]})
- }
- }
- } else {
- th.setData({
- is_show_sto_cat: -1,
- only_pk: e.data.data.pageData
- });
- //-----如果没有默认门店,要取第一个门店作为默认店.此时没有门店分类的情况------
- if (!th.data.def_pick_store) {
- th.setData({def_pick_store:e.data.data.pageData[0]})
- }
-
- }
- }
- });
- } else {
- th.setData({
- is_show_sto_cat: 0,
- only_pk: e.data.data.pageData
- });
- //-----如果没有默认门店,要取第一个门店作为默认店------
- if (!th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage) {
- th.setData({
- def_pick_store:e.data.data.pageData[0],
- sto_sele_name: e.data.data.pageData[0].pickup_name,
- sto_sele_id: e.data.data.pageData[0].pickup_id,
- sto_sele_distr: e.data.data.pageData[0].distr_type
- })
- }
- }
- },
-
-
-
- //---选择分类门店---
- choice_sort_store: function(e) {
- var index = e.currentTarget.dataset.index;
- var region_name = e.currentTarget.dataset.region;
- var item = this.data.all_sto[index];
- this.setData({
- region_name: region_name,
- sort_store: 0,
- choice_sort_store: 1,
- sec_sto: item,
- sec_pick_index: 0,
- });
- },
-
- choose_for_store_fir: function(e) {
- var index_c = e.currentTarget.dataset.ind;
- var th=this;
- th.setData({
- fir_pick_index: index_c
- })
- },
-
- //---点击二级之后的选择---
- choose_for_store: function(e) {
- var index_c = e.currentTarget.dataset.ind;
- var th=this;
- th.setData({
- sec_pick_index: index_c,
- fir_pick_index: index_c
- })
-
- },
-
- //确定def_pick为选择的门店
- sure_pick: function(e) {
- var th = this;
- var item = null;
-
- if (th.data.choice_sort_store == 0) {
- var index = th.data.fir_pick_index;
- if (th.data.is_show_sto_cat == 1) {
- item = th.data.def_pickpu_list[index];
- } else {
- item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候
- }
-
- } else {
- var index = th.data.sec_pick_index;
- item = th.data.sec_sto.s_arr[index];
- }
- if(!item) return false;
-
-
- th.setData({
- def_pick_store: item,
- sto_sele_name: item.pickup_name,
- sto_sele_id: item.pickup_id,
- sto_sele_distr: item.distr_type,
- store: 0,
- choice_sort_store: 0,
- fir_pick_index: 0
- });
-
-
- th.setData({
- yijian: 1, //打开拼团购买界面
- store: 0, //关闭门店
- choice_sort_store: 0, //关闭门店2级
- sort_store: 0, //关闭门店2级
- });
-
-
- },
-
-
-
- //把选择的门店设置成默认的门店def_pick
- set_def_pick: function(e) {
- var th = this;
- var item = null;
- if (th.data.choice_sort_store == 0) {
- var index = th.data.fir_pick_index;
- if (th.data.is_show_sto_cat == 1) {
- item = th.data.def_pickpu_list[index];
- } else {
- item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候
- }
- } else {
- var index = th.data.sec_pick_index;
- item = th.data.sec_sto.s_arr[index];
- }
-
- if(!item) return false;
-
-
- var store_id = o.stoid;
- var user_id = getApp().globalData.user_id;
- var def_pickup_id = item.pickup_id;
-
- getApp().request.put('/api/weshop/users/update', {
- data: {
- user_id,
- def_pickup_id
- },
- success: function(res) {
- if (res.data.code == 0) {
- if (th.data.choice_sort_store == 0) th.setData({
- fir_pick_index: 0
- });
- getApp().globalData.pk_store = item;
- } else {
- getApp().my_warnning("设置默认门店地址失败",0,th)
- }
-
- }
- });
-
- th.setData({
- def_pick_store: item,
- sto_sele_name: item.pickup_name,
- sto_sele_id: item.pickup_id,
- sto_sele_distr: item.distr_type,
- store: 0,
- choice_sort_store: 0
- });
-
- //4就是拼团
- th.setData({
- yijian: 1, //打开拼团购买界面
- store: 0, //关闭门店
- choice_sort_store: 0, //关闭门店2级
- sort_store: 0, //关闭门店2级
- });
-
- },
-
-
- //-- 关闭选择门店 --
- close_popup: function(e) {
- var th=this;
- this.setData({
- store: 0,
- choice_sort_store: 0,
- sort_store: 0,
- fir_pick_index:0,
- sec_pick_index:0,
- yijian: 1, //打开拼团购买界面
- })
-
- },
-
- //-- 弹出框的同意的优化,重新获取定位 ---
- agree_pri:function (){
- var th=this;
- var bconfig = th.data.bconfig;
- if (bconfig && bconfig.is_sort_storage) {
- wx.getLocation({
- type: 'gcj02',
- success: function (res) {
- th.data.lat = res.latitude;
- th.data.lon = res.longitude;
- th.data.is_get_local_ok = 1;
- th.setData({
- is_gps: 1
- });
- //th.onShow();
- th.get_sto();
- },
- fail: function (res) {
- //th.onShow();
- th.data.is_get_local_ok = 1;
- th.get_sto();
- if (res.errCode == 2) {
- th.setData({
- is_gps: 0
- });
- if (th.data.is_gps == 0) {
- getApp().confirmBox("请开启GPS定位", null, 25000, !1);
- }
- } else {
- th.setData({
- is_gps: "3"
- });
- }
-
- }
- })
- }
- },
-
-
-
+ onShow:function(){ },
})
\ No newline at end of file
diff --git a/pages/team/team_show/team_show.json b/pages/team/team_show/team_show.json
index 199474a..0b59e95 100644
--- a/pages/team/team_show/team_show.json
+++ b/pages/team/team_show/team_show.json
@@ -1,13 +1,10 @@
{
"windom": {
- "navigationBarTitleText": "拼团订单",
+ "navigationBarTitleText": "加载中.",
"backgroundTextStyle": "light",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#ffffff",
"backgroundColor": "#eeeeee"
- },
- "usingComponents": {
- "warn": "/components/long_warn/long_warn",
- "privacy_pop": "/components/privacy_pop/privacy_pop"
}
+
}
\ No newline at end of file
diff --git a/pages/team/team_show/team_show.wxml b/pages/team/team_show/team_show.wxml
index 7f4f542..7ce57f8 100644
--- a/pages/team/team_show/team_show.wxml
+++ b/pages/team/team_show/team_show.wxml
@@ -1,550 +1,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{goods.goods_name}}
-
-
-
-
-
- ¥{{teamlist.price}}
-
- ¥{{goods.shop_price}}
-
-
-
-
- 已拼{{teamlist.buy_num}}件
-
-
-
-
-
- {{teamlist.ct_num}}人拼
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 拼团成功,为您节省25元
-
-
-
-
-
-
- 拼团失败
-
-
-
-
-
-
-
-
-
- 团长
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 剩余
- {{obj.day}} :
- {{obj.hou}} :
- {{obj.min}} :
- {{obj.sec}} 结束
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 去参团
- 返回首页
-
-
- 一键参团
- 返回首页
-
-
- 一键参团
- 返回首页
-
-
-
-
- 会员'{{tg_arr.user_name}}'待付款,若{{r_obj.min}}分{{r_obj.sec}}秒后该会员未支付您可以继续参团哦!
-
-
-
- 去参团
- 返回首页
-
-
-
-
-
-
-
-
-
- 展开拼团列表
-
-
-
-
-
-
- 收起拼团列表
-
-
-
-
-
-
- {{item.nickname}}
-
- {{item.add_time_date}} 开团
- {{item.add_time_date}} 参团
-
-
-
-
-
-
-
-
-
- 大家都在团
-
-
-
-
-
-
-
-
- {{item.goods_name}}
-
-
- ¥{{item.price}}
- {{item.ct_num}}人
- 参团
-
-
-
-
-
+
+ 加载中。。
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{goods.goods_name}}
-
-
- ¥{{teamlist.kttype==3?teamlist.yf_price:teamlist.price}}
-
-
-
- 已售:{{teamlist.buy_num}}
- 可售:{{teamlist.goods_num-teamlist.buy_num}}
-
-
-
-
-
-
-
-
-
- {{def_pick_store.pickup_name}}
-
-
- 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
-
-
-
-
-
-
- 选择门店
-
-
- 更多门店
-
-
-
- (配送不匹配)
- (该店不可售)
- 地址:{{def_pick_store.fulladdress}}
-
-
-
-
- 商品规格
-
-
- {{goods.gg}}
-
-
-
-
-
-
-
-
- 购买数量
-
- -
-
- 1
- +
-
-
-
-
-
-
-
-
-
- 配送不匹配
- 该店不可售
- 确定
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{toastText}}
-
-
-
-
-
-
-
-
-
-
- 拼团玩法介绍
-
-
- 1.开团:
- 选择心仪商品,点击“发起X人团”按钮,付款后即为开团成功;
-
- 2.参团:
- 进入朋友分享的页面,点击“立即参团”按钮,付款后即为参团成功,若多人同时支付,支付成功时间较早的人获得参团资格;
-
- 3.成团:
- 在开团或参团成功后,点击“邀请小伙伴参团”将页面分享给好友,在有效时间内凑齐人数即为成团,此时商家会开始发货;
-
- 4.组团失败:
- 在有效时间内未凑齐人数,即为组团失败,此时付款项会原路退回到支付账户;
-
- 5.
- 组团有效期间内,拼购商品订单不允许取消。
-
-
-
-
-
-
diff --git a/pages/team/team_show/team_show.wxss b/pages/team/team_show/team_show.wxss
index cbff3ff..cc6cc05 100644
--- a/pages/team/team_show/team_show.wxss
+++ b/pages/team/team_show/team_show.wxss
@@ -1,2201 +1,5 @@
-page {
- background-color: #eee;
-}
-
-.top {
- background-color: rgb(216, 230, 220);
- color: rgb(98, 155, 13);
- text-align: center;
- height: 110rpx;
- width: 100%;
-}
-
-.center {
- height: 240rpx;
- width: 100%;
- background: #fff;
-}
-
-.cenleft {
- width: 240rpx;
- height: 100%;
- float: left;
- display: flex;
- justify-content: center;
- align-items: center;
-}
-
-.cenleft image {
- background-color: white;
- width: 200rpx;
- height: 200rpx;
-}
-
-.cenrt {}
-
-.cenright {
- height: 100%;
- width: auto;
- float: left;
-}
-
-.cenrtoptitle {
- float: left;
- width: 240rpx;
- height: 40rpx;
- margin-left: 12rpx;
- font-size: 28rpx;
- margin-top: 12rpx;
-}
-
-.cenrcen {
- height: 70rpx;
- margin-top: 35rpx;
- width: 479rpx;
-}
-
-.jg {
- font-size: 40rpx;
- margin-right: 30rpx;
-}
-
-.jgx {
- font-size: 24rpx;
- color: #777;
- text-decoration: line-through;
- margin-top: 12rpx;
-}
-
-.cenrfoot {
- align-content: center;
- text-align: center;
- border: 2rpx solid red;
- border-radius: 10rpx;
- color: red;
- float: left;
- font-size: 24rpx;
- padding: 4rpx 16rpx;
- margin-top: 12rpx;
-}
-
-.body {
- background-color: white;
- height: 472rpx;
- width: 100%;
- margin-top: 4rpx;
-}
-
-.d {
- font-size: 24rpx;
-}
-
-.bodytop {
- background-color: white;
- text-align: center;
- font-size: 28rpx;
- padding-top: 16rpx;
- height: 90rpx;
-
-}
-
-.bodytop span {
- color: red;
-}
-
-.bodyimg {
- height: 155rpx;
- /* display: flex;
- justify-content: center;
- align-items: center; */
-
-
-}
-
-.bodyimg image {
- border-radius: 50rpx;
- height: 96rpx;
- width: 96rpx;
- margin-top: 30rpx;
- position: absolute;
-
-}
-
-.d {
- width: 101rpx;
- height: 101rpx;
- display: inline-block;
-
-}
-
-.bodyimg span {
- background-color: #e22b44;
- color: white;
- font-size: 24rpx;
- border-radius: 6rpx;
- padding: 3rpx 10rpx;
- position: relative;
- top: 8px;
- left: 40rpx;
-}
-
-.bodyspan {
- color: red;
- text-align: center;
- font-size: 24rpx;
-}
-
-.bodytime {
- height: 55rpx;
- width: 100%;
- display: flex;
- flex-wrap: nowrap;
- padding-left: 40rpx;
- align-items: center;
-
-}
-
-.bodytimeleft {
- text-decoration: line-through;
- flex-grow: 1.7;
-}
-
-.bodytimecen {
- text-align: center;
- flex-grow: 1;
-
- font-size: 30rpx;
- color: #000;
- width: 415rpx;
-
-}
-
-.bodytimecen span {
- background-color: #333333;
- color: white;
- border-radius: 7rpx;
- padding-left: 20rpx;
- font-size: 30rpx;
- margin: 0 auto;
- padding-right: 10rpx;
- margin-right: 5px;
-
-
-}
-
-.bodytimecen span:last-child {
- margin-right: 10rpx;
-
-}
-
-.bodytimeright {
- flex-grow: 1.7;
- margin-right: 72rpx;
-
-}
-
-.bodybutton {
- min-height: 170rpx;
- width: 90%;
- margin: 0 auto;
- text-align: center;
- line-height: 70rpx;
- border-radius: 15rpx;
- height: auto;
- padding-top: 38rpx
-}
-
-.bodybutton button {
- height: 100%;
- width: 100%;
- background-color: red;
- color: white;
- font-size: 32rpx;
-}
-
-.bodybutton.co-w {
- color: #333;
- background-color: #adadad;
- font-size: 32rpx;
-
-}
-
-
-
-.bodyfoot {
- width: 100%;
- text-align: center;
- font-size: 28rpx;
- color: #777;
- background-color: white;
-}
-
-.pintuan {
- width: 100%;
- height: 84rpx;
- background-color: white;
- color: black;
- text-align: center;
- font-size: 36rpx;
- margin-top: 0rpx;
-}
-
-
-.pintuanzhou {
- float: left;
- line-height: 84rpx;
- width: 226rpx;
- background: url('https://mshopimg.yolipai.net/miniapp/images/user/wh.png') no-repeat right center;
- background-size: 42rpx;
- margin-left: -18rpx;
- font-size: 32rpx;
-}
-
-.pintuanyou {
- float: right;
- color: rgb(168, 167, 167);
- line-height: 84rpx;
- font-size: 32rpx;
- margin-right: 24rpx;
-}
-
-.onegoods {
- background-color: white;
- width: 372rpx;
- height: 560rpx;
- border-left: 2rpx solid #eee;
- float: left;
-}
-
-.goodsl {
- background-color: white;
-}
-
-.onegoodsimg {
- width: 100%;
- height: 360rpx;
- margin-bottom: 20rpx;
-}
-
-.onegoodsimg image {
- height: 100%;
- width: 100%;
-}
-
-.onegoodsdesc {
- color: rgb(168, 167, 167);
- padding-left: 20rpx;
- height: 100rpx;
- font-size: 32rpx;
- width: 92%;
- line-height: 100rpx;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- padding-right: 20rpx;
-}
-
-.onegoodsdesc text {}
-
-.price {
- color: red;
- width: 100%;
-}
-
-.jgleft {
- float: left;
- width: 100rpx;
- margin-left: 20rpx;
- font-size: 40rpx;
- margin-top: -8rpx;
-}
-
-.jgright {
- font-size: 28rpx;
- float: right;
- width: 120rpx;
-}
-
-.jgright span {
- color: rgb(168, 167, 167);
-}
-
-.goodslisttop {
- background-color: white;
- width: 100%;
-}
-
-.goodslist {
- background-color: white;
-}
-
-.goodslisttop {
- background-color: white;
- width: 100%;
- height: 80rpx;
- margin-top: 20rpx;
- text-align: center;
-}
-
-.goodslistspan {
- margin: 0 auto;
- padding-top: 20rpx;
- display: inline-block;
- padding: 0 10px;
- background: #fff;
- margin-top: 12rpx;
- font-size: 28rpx;
- color: rgb(168, 167, 167);
-}
-
-.xian {
- height: 50%;
- width: 100%;
- border-bottom: 4rpx solid #eee;
- float: left;
-}
-
-.bodyselect {
- height: 50px;
- background-color: white;
- width: 100%;
- line-height: 50px;
- font-size: 28rpx;
-}
-
-.changxin {
- float: left;
- width: 100%;
-}
-
-.zhangxi {
- width: 100%;
- min-height: 100rpx;
- background-color: white;
- color: black;
-}
-
-.img {
- width: 30%;
- height: 100rpx;
- margin-bottom: 0rpx;
- color: black;
- margin-left: 36rpx;
- font-size: 26rpx;
- display: flex;
-}
-
-.img span {
- height: 100rpx;
- display: block;
- line-height: 100rpx;
- text-overflow: ellipsis;
- white-space: nowrap;
- overflow: hidden;
- padding: 0rpx;
- width: 120rpx;
-}
-
-.zhangxi image {
- border-radius: 50rpx;
- height: 80rpx;
- width: 80rpx;
- float: left;
- margin-top: 12rpx;
- background-color: red;
- margin-right: 10rpx;
-}
-
-.zhangxi .zssj {
- height: 100rpx;
- width: 70%;
- margin-right: 40rpx;
- line-height: 100rpx;
- font-size: 26rpx;
- text-align: right;
-}
-
-.zhangxi .zssj text {
- width: 100%;
-}
-
-.ia {
- display: flex;
-}
-
-.zspan {
- text-align: center;
- border-bottom: 2rpx #eee solid;
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 28rpx;
- color: #777;
- line-height: 100rpx;
- height: auto;
-
-}
-
-.mtop {
- text-align: center;
- color: white;
- background-color: #4c4c4c;
- width: 100%;
- height: 100%;
- position: fixed;
- z-index: 5;
- top: 0;
- left: 0;
-}
-
-.mt1 {
- margin-top: 100px;
- margin-bottom: 20rpx;
-}
-
-.mts {
- color: #e1e10b;
-}
-
-.mcou {
- font-size: 48rpx;
-}
-
-.mfoot {
- width: 100%;
- margin-top: 700rpx;
-}
-
-.mbtn {
- margin-top: 60rpx;
- width: 400rpx;
- background: #666;
- color: #fff;
- border-radius: 20rpx;
- font-size: 32rpx;
-}
-
-.etop {
- padding-top: 200rpx;
- width: 100%;
- height: 100%;
- position: fixed;
- left: 0rpx;
- top: 0rpx;
- z-index: 12rpx;
- background-color: white;
-}
-
-.emyimage {
- display: flex;
- justify-content: center;
- align-items: center;
-}
-
-.emyimage image {
- background-color: red;
- width: 160rpx;
- height: 160rpx;
- margin: 0 auto;
-}
-
-.espan {
- font-size: 32rpx;
- margin-top: 10rpx;
-}
-
-.erweima {
- margin-top: 10rpx;
- width: 100%;
-}
-
-.erzhou {
- width: 200rpx;
- float: left;
- margin-right: 20rpx;
-}
-
-.erzhou image {
- background-color: blanchedalmond;
- width: 200rpx;
- height: 200rpx;
-}
-
-.eright {
- width: 500rpx;
- float: left;
- font-size: 32rpx;
-}
-
-.body {
- background-color: white;
- height: auto;
- width: 100%;
- margin-top: 4rpx;
-}
-
-.cenrtoptitle {
- float: left;
- width: 450rpx;
- font-size: 28rpx;
- margin-top: 20rpx;
-
-}
-
-.cenrtop {
- margin-top: 20rpx;
- background-color: red;
- color: white;
- border-radius: 10rpx;
- padding: 0 16rpx;
- font-size: 28rpx;
- float: left;
- height: 40rpx;
-}
-
-.yijian {
- position: fixed;
- top: 0rpx;
- left: 0rpx;
- width: 100%;
- height: 100%;
- z-index: 14rpx;
- background-color: rgba(0, 0, 0, 0.3);
-}
-
-.buy-option {
- background: #fff;
- box-shadow: 0 0 6px rgba(0, 0, 0, 0.5);
- padding: 20rpx;
- min-height: 400rpx;
- padding-bottom: 120rpx;
- width: 100%;
- margin-top: 180rpx;
-}
-
-.buy-top {
- width: 100%;
-}
-
-.buy-image {
- margin-right: 20rpx;
- width: 320rpx;
- height: 200rpx;
- float: left;
-}
-
-.buy-image image {
- width: 200rpx;
- height: 200rpx;
- background-color: burlywood;
- float: left;
-}
-
-.buy-image text {
- margin-left: 10rpx;
- color: red;
-}
-
-.buy-cou {
- float: right;
- width: 100rpx;
- height: 200rpx;
- background-color: white;
- font-size: 60rpx;
- color: black;
-}
-
-.t1 {
- float: left;
- font-size: 28rpx;
- padding-left: 4rpx;
- color: red;
- padding-top: 10rpx;
-}
-
-.buy-button {
- width: 100%;
- float: left;
- margin-top: 22rpx;
-}
-
-.buy-button text {
- float: left;
-}
-
-.stepper {
- height: 52rpx;
- float: left;
- border: 2rpx solid #ccc;
- border-radius: 6rpx;
- margin-left: 28rpx;
-}
-
-/*加号和减号*/
-
-.stepper text {
- float: left;
- width: 76rpx;
- line-height: 52rpx;
- text-align: center;
-}
-
-/*数值*/
-
-.stepper input {
- width: 80rpx;
- height: 52rpx;
- float: left;
- margin: 0 auto;
- text-align: center;
- font-size: 24rpx;
- border-left: 2rpx solid #ccc;
- border-right: 2rpx solid #ccc;
-}
-
-/*普通样式*/
-
-.stepper .normal {
- color: black;
-}
-
-/*禁用样式*/
-
-.stepper .disable {
- color: #ccc;
-}
-
-.quhuo {
- width: 100%;
- color: rgb(51, 51, 51);
- float: left;
- margin-top: 20rpx;
-}
-
-.x-z {
- width: 100%;
- float: left;
- color: rgb(51, 51, 51);
- font-size: 36rpx;
-}
-
-.btn {
- width: 94%;
- background-color: red;
- color: white;
- text-align: center;
- height: 88rpx;
- line-height: 88rpx;
- float: left;
- margin: 0 auto;
-}
-
-.mck {
- min-height: 100rpx;
- width: 100%;
- border-bottom: 24rpx #eee solid;
-}
-
-/* pages/yi/yi.wxss */
-
-.buy-option {
- background: #fff;
- padding: 20rpx;
- margin-top: 650rpx;
- width: 100%;
-}
-
-.buy-top {
- width: 100%;
-}
-
-.buy-image {
- margin-right: 20rpx;
- width: 630rpx;
- height: 200rpx;
- float: left;
-}
-
-.buy-image image {
- width: 200rpx;
- height: 200rpx;
- background-color: burlywood;
- float: left;
- margin-right: 16rpx;
-}
-
-
-.buy-image text {
- margin-left: 10rpx;
- color: red;
-}
-
-.buy-cou {
- float: right;
- width: 60rpx;
- height: 60rpx;
- background-color: white;
- font-size: 60rpx;
- color: black;
- margin-right: 40rpx;
- text-align: center;
- line-height: 60rpx;
- padding-bottom: 4rpx;
-}
-
-.t1 {
- font-size: 28rpx;
- padding-left: 4rpx;
- color: red;
- padding-top: 10rpx;
-}
-
-.buy-button {
- width: 100%;
- margin-top: 30rpx;
-}
-
-.buy-button text {
- /*float: left;*/
- display: inline-block;
-}
-
-.stepper {
- height: 52rpx;
- display: inline-block;
- border: 2rpx solid #ccc;
- border-radius: 6rpx;
- margin-left: 28rpx;
-}
-
-/*加号和减号*/
-
-.stepper text {
- float: left;
- width: 65rpx;
- line-height: 52rpx;
- text-align: center;
-}
-
-/*数值*/
-
-.stepper input {
- width: 84rpx;
- height: 52rpx;
- float: left;
- margin: 0 auto;
- text-align: center;
- font-size: 24rpx;
- border-left: 2rpx solid #ccc;
- border-right: 2rpx solid #ccc;
-}
-
-/*普通样式*/
-
-.stepper .normal {
- color: black;
-}
-
-/*禁用样式*/
-
-.stepper .disable {
- color: #ccc;
-}
-
-.quhuo {
- width: 100%;
- color: rgb(51, 51, 51);
- margin-top: 45rpx;
- font-size: 32rpx
-}
-
-.quhuo image {
- width: 40rpx;
- height: 40rpx;
- display: inline-block;
- position: relative;
- left: 500rpx;
-}
-
-.ttxz {
- display: inline-block;
-}
-
-.xuanze {
- width: 100%;
- height: 80rpx;
- display: inline-block;
- border-bottom: 1rpx #e7e7e7 solid;
- font-size: 32rpx;
- line-height: 80rpx;
-}
-
-.xuanze1 {
- width: 100%;
- color: rgb(51, 51, 51);
- height: 80rpx;
- display: inline-block;
- border-bottom: 1rpx #e7e7e7 solid;
- line-height: 80rpx;
- overflow: hidden;
-}
-
-.x-z {
- width: 100%;
- color: rgb(51, 51, 51);
- font-size: 36rpx;
- height: auto;
-}
-
-.btn {
- width: 100%;
- background-color: red;
- color: white;
- text-align: center;
- height: 88rpx;
- line-height: 88rpx;
-}
-
-.clear {
- clear: both;
-}
-
-.fir_view {
- max-height: 300rpx;
- overflow-y: scroll;
-}
-
-.pop_up {
- min-height: 200rpx;
- position: fixed;
- bottom: 0;
- left: 0;
- width: 100%;
- background-color: rgba(0, 0, 0, 0.3);
- font-size: 34rpx;
- color: rgb(51, 51, 51);
-
-}
-
-.end_name {
- display: inline-block;
-}
-
-/*mask*/
-
-.toast_mask {
- opacity: 0;
- width: 100%;
- height: 100%;
- overflow: hidden;
- position: fixed;
- top: 0rpx;
- left: 0rpx;
- z-index: 888;
-}
-
-/*toast*/
-
-.toast_content_box {
- display: flex;
- width: 100%;
- height: 100%;
- justify-content: center;
- align-items: center;
- position: fixed;
- z-index: 999;
- top: 0rpx;
-}
-
-.toast_content {
- width: 50%;
- padding: 20rpx;
- background: rgba(0, 0, 0, 0.5);
- border-radius: 20rpx;
-}
-
-.toast_content_text {
- height: 100%;
- width: 100%;
- color: #fff;
- font-size: 28rpx;
- text-align: center;
-}
-
-.jt {
- width: 30rpx;
- height: 30rpx;
- display: inline-block;
-}
-
-.jiajian {
- color: #999;
-}
-
-.t_wz {
- line-height: 110rpx;
- height: 110rpx;
- font-size: 36rpx;
-}
-
-.down-arrow {
- display: inline-block;
- position: relative;
- width: 40rpx;
- height: 30rpx;
- margin-right: 20rpx;
-}
-
-.down-arrow::after {
- display: inline-block;
- content: " ";
- height: 18rpx;
- width: 18rpx;
- border-width: 0 2rpx 2rpx 0;
- border-color: #999;
- border-style: solid;
- transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
- transform-origin: center;
- transition: transform 0.3s;
- position: absolute;
- top: 50%;
- right: 10rpx;
- margin-top: -10rpx;
-}
-
-.down-arrow1 {
- display: inline-block;
- position: relative;
- width: 40rpx;
- height: 30rpx;
- margin-right: 20rpx;
- margin-top: 12rpx;
-}
-
-.down-arrow1::after {
- display: inline-block;
- content: " ";
- height: 18rpx;
- width: 18rpx;
- border-width: 0 2rpx 2rpx 0;
- border-color: #999;
- border-style: solid;
- transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
- transform-origin: center;
- transition: transform 0.3s;
- position: absolute;
- top: 50%;
- right: 10rpx;
- margin-top: -10rpx;
-}
-
-.down-arrow1::after {
- transform-origin: center;
- transform: rotate(-135deg);
- transition: transform 0.3s;
-}
-
-.goodslisttop::after {
- content: "";
- width: 100%;
- height: 1px;
- border-bottom: 1px #d4d4d4 solid;
- display: block;
- margin-top: -12px;
-}
-
-.ia {
- display: flex;
- width: 100%;
-}
-
-.bview {
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- background-color: rgba(0, 0, 0, 0.5);
-}
-
-.juzhong {
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- display: flex;
- flex-direction: row;
- justify-content: center;
- align-items: center;
-}
-
-.juzhong .xq {
- padding: 0 20rpx;
- background: #fff;
- font-size: 30rpx;
- padding-bottom: 20rpx;
-}
-
-.juzhong .xq .title {
- text-align: center;
- margin: 20rpx 0;
- position: relative;
- height: 50rpx;
-}
-
-.juzhong .xq .hs1 {
- font-size: 28rpx;
- color: #ab8f9e;
-}
-
-.juzhong .xq .title .close {
- position: absolute;
- top: 0;
- right: 0;
- width: 45rpx;
- height: 45rpx;
-}
-
-/* .pt_qd {
- margin-top: 40rpx;
- height: auto;
-} */
-
-.spec-cart-btn.w100 {
- width: 100%;
- margin-left: 0;
- height: 80rpx;
- line-height: 80rpx;
-}
-
-
-.bview {
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- background-color: rgba(0, 0, 0, 0.5);
-}
-
-.juzhong {
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- display: flex;
- flex-direction: row;
- justify-content: center;
- align-items: center;
-}
-
-.juzhong .xq {
- padding: 0 20rpx;
- background: #fff;
- font-size: 30rpx;
- padding-bottom: 20rpx;
-}
-
-.juzhong .xq .title {
- text-align: center;
- margin: 20rpx 0;
- position: relative;
- height: 50rpx;
-}
-
-.juzhong .xq .hs1 {
- font-size: 28rpx;
- color: #ab8f9e;
-}
-
-.juzhong .xq .title .close {
- position: absolute;
- top: 0;
- right: 0;
- width: 45rpx;
- height: 45rpx;
-}
-
-.pt_qd {
- /* margin-top: 40rpx;
- height: auto; */
- padding: 20rpx;
-}
-
-.spec-cart-btn.w100 {
- width: 100%;
- margin-left: 0;
- height: 80rpx;
- line-height: 80rpx;
-}
-
-.show_zf_dd {
- display: flex;
- padding: 15rpx 40rpx;
- justify-content: space-between;
- font-size: 30rpx;
- color: #666;
-}
-
-.flex_tou {
- display: flex;
- justify-content: center;
- width: 100%;
- height: 175rpx;
- align-items: center;
-}
-
-.xc-goods-details {
- width: 479rpx;
- margin-top: 20rpx;
- height: 80rpx;
- align-items: center;
-
-}
-
-.xc-valframe {
- border-radius: 7rpx;
- border: 1rpx solid;
- margin-top: 3rpx;
-}
-
-.xc-valframe .xc-frame-img {
- width: 30rpx;
- height: 100%;
- background: #e22b44;
-}
-
-.xc-valframe .xc-frame-img .picture {
- width: 25rpx;
- height: 25rpx;
- margin-top: 4rpx;
-
-}
-
-.bodybutton .xc-good-friend {
- background: #fab55a;
- border-radius: 15rpx;
-}
-
-.bodybutton .xc-home-page {
- margin-top: 20rpx;
- background-color: #e22b44;
- border-radius: 15rpx;
-}
-
-.xc-ellipsis-img {
- width: 56rpx;
- height: 56rpx;
- padding-top: 15rpx;
-}
-
-.xc-ptcomplete {
- width: 74%;
- height: 105rpx;
- line-height: 105rpx;
- float: right;
-
-}
-
-.xc-ptcomplete .xc-img-frame .img {
- width: 105rpx;
- height: 105rpx;
- float: right;
-}
-
-.xc-ptcomplete .xc-img-frame {
- width: 205rpx;
- height: 105rpx;
- margin-top: 20rpx;
-}
-
-.xc-ptcomplete .xc-end {
- width: 283rpx;
- text-align: right;
-}
-
-.iw {
- padding-right: 33rpx;
-}
-
-.xc-ptcomplete .xc-img-frames {
- width: 345rpx;
- height: 105rpx;
- margin-top: 20rpx;
-
-}
-
-.xc-ptcomplete .xc-img-frames .img {
- width: 105rpx;
- height: 105rpx;
- float: right;
-}
-
-.bodybutton .xc-good-friend.co-w {
- background-color: #aeaeae
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-.spec-model {
- position: fixed;
- bottom: 0;
- z-index: 20;
- background: white;
- width: 100%;
- /* padding: 0 30rpx; */
- font-size: 32rpx;
- box-sizing: border-box;
- border-radius: 20rpx;
- /* height: 72%; */
-}
-
-.spec-model .pding {
- padding: 0 30rpx;
-}
-
-.spec-goods {
- padding: 30rpx 0 20rpx;
- float: left;
- width: 100%;
- border-bottom: 2rpx solid #eee;
-}
-
-.spec-img {
- float: left;
- height: 186rpx;
- width: 186rpx;
- border: 4rpx solid #eee
-}
-
-.spec-goods-info {
- float: left;
- padding: 0 25rpx;
- width: 400rpx;
-}
-
-.spec-goods-name {
- font-size: 30rpx;
- line-height: 35rpx;
- height: 70rpx;
- margin: 15rpx 20rpx 25rpx 0;
- overflow: hidden;
- text-overflow: ellipsis;
- color: #333;
-}
-
-.spec-goods-price {
- color: #d60021;
- font-size: 33rpx;
- font-weight: bold;
-}
-
-.spec-goods-stock {
- margin-top: 3rpx;
- font-size: 24rpx;
- color: #999999;
- margin-right: 15rpx;
-}
-
-.spec-name {
- clear: both;
- padding: 20rpx 0;
- font-size: 30rpx;
- color: #333;
-}
-
-.quhuo {
- font-size: 30rpx;
- color: #000
-}
-
-.b_num {
- display: flex;
- font-size: 30rpx;
- color: #333;
- justify-content: space-between;
-}
-
-.count {
- /* position: fixed; */
- display: flex;
- height: 50rpx;
- /* border: 1rpx solid #000; */
- font-size: 28rpx;
- /* right: 30rpx; */
- /* justify-content: space-between; */
-}
-
-
-.count>view,
-.count>input {
- width: 60rpx;
- height: 50rpx;
- line-height: 50rpx;
- text-align: center;
-}
-
-.spec_bt {
- background: fff;
- color: #333;
- margin-left: 10rpx;
- padding: 4rpx 15rpx 4rpx;
- display: inline-block;
- border-radius: 30rpx;
- font-size: 24rpx;
- border: 1rpx solid #ccc;
- margin: 10rpx;
- height: 40rpx;
- line-height: 40rpx;
-}
-
-.spec_bt.act {
- background: #d60021;
- color: #fff;
- border: 1rpx solid #d60021;
-}
-
-.sub, .add, .count>input {
- /* border-right: 1px solid #000; */
- background-color: #f8f8f8;
- border-radius: 8rpx;
-}
-.sub.active {
- /* background-color: #ddd; */
- color: #ccc;
-}
-.count>input {
- margin: 0 10rpx;
- line-height: normal;
-}
-
-/* .sub {
- border-right: 1px solid #000;
-}
-
-.add {
- border-left: 1px solid #000;
-} */
-
-.spec-btn {
- color: black;
- background-color: white;
- padding: 10rpx 10rpx;
- font-size: 26rpx;
- line-height: 28rpx;
- float: left;
- border: 1rpx solid #dedede;
- margin: 4rpx 10rpx 4rpx 0;
- border-radius: 4rpx;
-}
-
-.spec-btn-click {
- color: white;
- background-color: #f23030;
- border: 1rpx solid #f23030;
-}
-
-.spec-cart-btns {
- width: 92%;
- line-height: 70rpx;
- margin: 0rpx auto;
- margin-top: 160rpx;
- border-radius: 20rpx;
- position: fixed;
- bottom: 50rpx;
- left: 4%;
-
-}
-
-.spec-cart-btn {
-
- width: 100%;
- font-size: 30rpx;
- text-align: center;
- color: white;
- border-radius: 40rpx;
-}
-
-.spec-add-cart {
- background-color: #ffb03f;
-}
-
-.spec-buy {
- background-color: #f23030;
- /* margin-left: 34rpx; */
-}
-
-.spec-cart-disable {
- background: #bbbbbb;
-}
-
-.spec-cart-btn-lg {
- width: 614rpx;
-}
-
-.prom-model {
- position: fixed;
- bottom: 0;
- z-index: 20;
- background: white;
- width: 100%;
- padding: 0 30rpx 30rpx;
- font-size: 32rpx;
- box-sizing: border-box;
- overflow-x: hidden;
-}
-
-.prom-model .prom-title {
- text-align: center;
- margin: 30rpx 0;
-}
-
-.prom-model .logistics-item {
- border: 0;
-}
-
-.prom-model .item-mes {
- width: 500rpx;
-}
-
-.integral-btn {
- width: 100%;
- padding: 0rpx;
- margin: 0rpx;
-}
-
-.clear {
- clear: both;
-}
-
-.sto_v .title,
-.sto_v .stitle {
- border-top: 1rpx solid #dedede;
- border-bottom: 1rpx solid #dedede;
- height: 78rpx;
- line-height: 78rpx;
-}
-
-.sto_v .title .tubiao,
-.sto_v .stitle .tubiao {
- width: 32rpx;
- height: 32rpx;
- margin-top: 23rpx;
-}
-
-.itemlists .item {
- border-bottom: 1rpx solid #dedede;
- height: 72rpx;
- line-height: 72rpx;
- font-size: 28rpx;
- margin: 0 10rpx;
-}
-
-.cshu {
- margin-bottom: 30rpx;
- margin-top: 20rpx;
-}
-
-.cshu view {
- color: #999;
- font-size: 30rpx;
- margin-left: 26rpx;
-}
-
-
-/*---活动特殊显示---*/
-.prom_show {
- height: 120rpx;
- display: flex;
-}
-
-.prom_show .secondkill-img {
- width: 100%;
- height: 100%;
-}
-
-.prom_show .spike-img {
- width: 283rpx;
- height: 57rpx;
- top: 35rpx;
- left: 31rpx;
-}
-
-.prom_show .stop {
- color: #d81731;
- top: 17rpx;
- right: 65rpx;
- font-weight: 600;
-}
-
-.prom_show .start {
- color: #009ae2;
- top: 17rpx;
- right: 65rpx;
- font-weight: 600;
-}
-
-.prom_show .timeac {
- font-size: 32rpx;
- height: 120rpx;
- color: #333;
-}
-
-.prom_show .timeac.left {
- width: 66%;
- color: #fff;
- background: #f23030;
-}
-
-.prom_show .timeac.right {
- width: 34%;
- background-color: #d7d7d7;
- text-align: center
-}
-
-.prom_show .secview .day {
- padding-right: 10rpx;
-}
-
-.prom_show .secview .time-val {
- width: 36rpx;
- height: 36rpx;
- border-radius: 7rpx;
- line-height: 36rpx;
-}
-
-.prom_show .secview .time {
- margin-right: 10rpx;
- margin-left: 10rpx;
-}
-
-
-.prom_show .timeac.left view {
- margin-left: 20rpx
-}
-
-.prom_show .timeac.left view.firview {
- margin-top: 10rpx
-}
-
-.prom_show .timeac.left view .tr_line {
- text-decoration: line-through;
- font-size: 28rpx;
-}
-
-.prom_show .timeac.left view .bprice {
- font-size: 50rpx;
-}
-
-.prom_show .timeac.right view.firview {
- margin-top: 12rpx;
- margin-bottom: 10rpx
-}
-
-.prom_show .timeac.right view.secview {
- display: flex;
- text-align: center;
- justify-content: center;
- flex-direction: row;
-}
-
-.prom_show .timeac.right view .tui-conutdown-box {
- /* background: #6b6b6b; */
- width: auto;
- /* min-width: 45rpx; */
- height: 45rpx;
- color: #c4182e;
- font-size: 27rpx;
- text-align: center;
- line-height: 46rpx;
-}
-
-.huise {
- background: gray
-}
-
-.lanse {
- background: #0199e2
-}
-
-
-/*------拼单------*/
-.pt_view {
- text-align: center;
- width: 100%;
- height: 100rpx;
- line-height: 100rpx;
- font-size: 26rpx
-}
-
-.pt_view .secondkill-img {
- width: 100%;
- height: 100%;
-}
-
-.pt_fir {
- background: #fff;
- margin-bottom: 10rpx;
-}
-
-.pt_fir .pt_fir_title {
- display: flex;
- align-items: center;
- margin-left: 10rpx;
- margin-top: 20rpx;
- font-size: 28rpx;
- position: relative;
-}
-
-.pt_fir .pt_fir_title .kt_type {
- color: #fff;
- background: #e9030d;
- width: 100rpx;
- line-height: 40rpx;
- border-radius: 6rpx;
- margin: 0 10rpx;
- height: 40rpx;
- font-size: 24rpx;
- text-align: center;
-}
-
-.pt_fir .pt_fir_title .price {
- color: #e9030d;
- font-size: 26rpx;
-}
-
-.pt_fir .pt_fir_title .bigw {
- font-size: 36rpx;
-}
-
-.pt_fir .pt_fir_title .tprice {
- text-decoration: line-through;
- color: #949494
-}
-
-.pt_fir .pt_fir_title .tprice.ml50 {
- margin-left: 50rpx
-}
-
-.pt_fir .pt_fir_title .js {
- padding: 0 15rpx;
- height: 40rpx;
- background: #e9030d;
- text-align: center;
- border-radius: 8rpx;
- color: #fff;
- margin-left: 10rpx;
-}
-
-.pt_fir .pt_fir_title .tuannum {
- color: #e9030d;
- position: absolute;
- right: 20rpx;
- font-size: 26rpx;
-}
-
-.pding {
- padding-top: 20rpx;
- padding-left: 20rpx;
- height: 81%;
- padding-right: 20rpx;
- font-size: 26rpx;
- color: #ea120f
-}
-
-.pdres {
- margin-left: 10rpx;
- color: #8f8f94
-}
-
-.ptgz {
- position: relative;
- font-size: 30rpx;
- padding-left: 20rpx;
- margin-top: 10rpx;
- overflow: hidden
-}
-
-.shuxian {
- width: 6rpx;
- height: 28rpx;
- background: #ea120f;
- display: inline-block;
- top: 5rpx;
- position: relative;
- margin-right: 5rpx
-}
-
-.ptgz_an {
- position: absolute;
- top: 5rpx;
- right: 6rpx
-}
-
-.ptgz_an .arrow-two {
- width: 18rpx;
- height: 18rpx;
- border-color: #da0b31;
- margin-top: 30rpx;
-}
-
-.pt_fir.se {
- height: auto;
- margin-bottom: 10rpx
-}
-
-.t_gz {
- padding: 10rpx 20rpx;
- font-size: 28rpx
-}
-
-.pt_fir.se1 {
- height: auto;
- margin: 0
-}
-
-.pt_fir.se2 {
- height: auto;
- margin: 0;
- border-top: 6rpx solid #eeeeee;
- border-bottom: 2rpx solid #eeeeee;
-}
-
-.pt_hb {
- height: 78rpx;
- line-height: 75rpx;
- position: relative;
- font-size: 32rpx;
- overflow: hidden;
- width: 695rpx;
- margin-left: 28rpx;
- border-bottom: 1rpx solid #E5E5E5
-}
-
-.ptgz_an.xq {
- font-size: 32rpx;
- color: #d40024
-}
-
-.wf {
- display: flex;
- padding: 20rpx 0;
-}
-
-.wf .item {
- width: 24.5%;
- text-align: center;
- font-size: 26rpx;
- color: #666
-}
-
-.wf .item .item_txy {
- position: relative;
- width: 60rpx;
- height: 60rpx;
- background: #ea120f;
- border-radius: 50%;
- left: 50%;
- margin-left: -30rpx;
- border: 3px #dfdfdf solid;
- text-align: center;
- line-height: 60rpx;
- color: #fff;
- margin-bottom: 10rpx;
-}
-
-.wf .item .item_txy.hs {
- background: #cbcbcb;
-}
-
-.po {
- margin-bottom: 20rpx;
-}
-
-.cart-btn.line-h {
- line-height: 26rpx;
-}
-
-.cart-btn .fir-v {
- margin-top: 10rpx;
-}
-
-.hyt {
- padding: 0 20rpx;
- font-size: 30rpx;
- display: flex;
- align-items: center;
- margin-top: 10rpx;
-}
-
-.hyt .r_f {
- color: #e9120f;
- font-size: 26rpx;
- position: relative;
- top: 3rpx
-}
-
-.hyt .byj {
- color: #e9120f;
- font-size: 32rpx;
- position: relative;
- top: 5rpx
-}
-
-.pt_fir .pt_fir_title.no-mar-b {
- margin-bottom: 0;
- padding-bottom: 10rpx;
- margin-left: 20rpx
-}
-
-.pt_fir .pt_fir_title.boder-1 {
- border-bottom: 1rpx #e7e7e7 solid
-}
-
-.jie_price {
- padding: 10rpx 30rpx;
-}
-
-.jie_price_title {
- font-size: 30rpx;
- color: #a26270;
- margin-bottom: 10rpx
-}
-
-.price_list {
- display: flex;
- width: 100%;
-}
-
-.price_item {
- width: 25%;
- font-size: 28rpx;
- color: #4c336c
-}
-
-.pt_fir.se2 .zzk-1 {
- margin-top: 23rpx;
- font-size: 30rpx;
- position: relative;
- margin-bottom: 30rpx;
- border-left: 4rpx solid red;
- margin-left: 14rpx;
- height: 30rpx;
- line-height: 30rpx;
- padding-left: 5rpx;
-}
-
-.ckgd {
- position: absolute;
- top: 0;
- right: 57rpx;
- color: #d70025;
- font-size: 32rpx;
-}
-
-.ckgd .arrow-one {
- width: 18rpx;
- height: 18rpx;
- border-color: #da0b31;
- margin-top: 5rpx;
-}
-
-.bview {
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- background-color: rgba(0, 0, 0, 0.5);
-}
-
-.juzhong {
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- display: flex;
- flex-direction: row;
- justify-content: center;
- align-items: center;
-}
-
-.juzhong .xq {
- padding: 0 20rpx;
- background: #fff;
- font-size: 30rpx;
- padding-bottom: 20rpx;
-}
-
-.juzhong .xq .title {
- text-align: center;
- margin: 20rpx 0;
- position: relative;
- height: 50rpx;
-}
-
-.juzhong .xq .hs1 {
- font-size: 28rpx;
- color: #ab8f9e
-}
-
-.juzhong .xq .title .close {
- position: absolute;
- top: 0;
- right: 0;
- width: 45rpx;
- height: 45rpx;
-}
-
-.pt_qd {
- /* margin-top: 40rpx;
- height: auto; */
-}
-
-.spec-cart-btn.w100 {
- width: 95%;
- margin-left: 0;
- height: 75rpx;
- line-height: 75rpx;
- margin: auto;
-}
-
-.sto_v {
- color: #333;
-}
-
-.ellipsis {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
-}
-
-
-
-
-/* 房子图标 */
-.stores-img {
- width: 40rpx;
- height: 35rpx;
- margin-right: 10rpx;
-}
-
-.right-arrow {
- width: 15rpx;
- height: 15rpx;
- border-top: 2rpx solid #d70026;
- border-right: 2rpx solid #d70026;
- transform: rotate(45deg);
- display: inline-block;
- margin-bottom: 3rpx;
-}
-
-.distance{
- padding-left: 15rpx;
- padding-right: 15rpx;
- background: #eee;
- border-radius: 20rpx;
- margin-right: 5rpx;
- color: #999;
- height: 38rpx;
- line-height: 38rpx;
-}
-
-.shop_name{
- margin-right: 10rpx;
-}
-
-.xc-distance-top{
- margin-top: 10rpx;
-}
-
-
-.popup-frame{
- position: fixed;
- /* bottom:99rpx; */
- bottom: 0;
- z-index: 20;
- background: white;
- width: 100%;
- border-radius: 20rpx 20rpx 0 0;
- height: auto;
-}
-
-.popup-top{
- border-bottom: 1rpx solid #eee;
- height: 155rpx;
- width: 95%;
- margin: auto;
- line-height: 155rpx;
-
-}
-
-
-/* .flex-space-between{
- display: flex;
- justify-content:space-between;
-} */
-
-.modal-closes {
- position: absolute;
- right: 30rpx;
- top: -15rpx;
- height: 25rpx;
-}
-
-.choose_more{
- margin-top: 40rpx;
- margin-right: 20rpx;
-
-}
-.choose_mores{
- margin-top: 30rpx;
- margin-right: 15rpx;
-
-}
-
-.bg_rights{
- border-top: 2rpx solid ;
- border-right: 2rpx solid ;
- transform: rotate(45deg);
- display: inline-block;
- width: 15rpx;height:15rpx;
- border-color: #da0b31;
-}
-
-
-.mongolia-layer{
- position: fixed;
- left: 0;
- top: 0;
- right: 0;
- bottom: 0;
- z-index: 11;
- background: rgba(0,0,0,0.4);
- width: 100%;
- height: 91.9%;
-}
-
-
-
-
-.store-list{
- width: 95%;
- min-height:300rpx;
- overflow-y: scroll;
- margin: auto;
- max-height: 610rpx;
-}
-
-.store-list .store_choose{
- width: 100%;
- height: 120rpx;
- line-height: 125rpx;
- border-bottom: 1rpx solid #eee;
-}
-
-.store-list .store_choose .store{
- width: 100%;
- margin: auto;
- line-height: 37rpx;
- padding-left: 20rpx;
-}
-
-.xc-hook{
- width: 35rpx;
- height: 35rpx;
- transform: rotate(-145deg);
- line-height: 37rpx;
- text-align: center;
-}
-
-.butttem5{
- margin-bottom: 5rpx;
-}
-
-.address-frame{
- width: 93%;
- margin-left: 7rpx;
-}
-
-.store-bottom{
- width: 85%;
- margin: auto;
- height: 90rpx;
- }
-
- .determine{
- width: 260rpx;
- height: 55rpx;
- border-radius: 50rpx;
- line-height: 55rpx;
- }
-
- .default{
- width: 260rpx;
- height: 55rpx;
- border:3rpx solid #c8c8c8;
- border-radius: 50rpx;
- line-height: 55rpx;
- }
-
- .sort_store_list .sort-store-frame .sort-store {
- width: 94.5%;
- margin: auto;
- }
-
-
- .sort_store_list .sort-store-frame{
- width: 100%;
- height: 100rpx;
- line-height:100rpx;
- border-bottom: 1rpx solid #eee;
- }
-
- .black_rights-frame .black_rights{
- border-top: 3rpx solid;
- border-right: 3rpx solid;
- transform: rotate(45deg);
- display: inline-block;
- width: 20rpx;
- height: 20rpx;
- }
-
-
- .sort_store_list{
- max-height: 700rpx;
- overflow: hidden;
- overflow-y: scroll;
- width: 95%;
- margin: auto;
- }
-
- .xc-hooks{
- width: 30rpx;
- height: 30rpx;
- border: 1rpx solid #999;
-}
-
-.no_store{color:#d60021; font-size: 26rpx;}
-
-.sub.active {
- /* background-color: #ddd; */
- color: #ccc;
-}
-
-.c-red22{ color:#d60021; }
+.rty{
+ display:flex; justify-content: center; align-items: center;
+ width:100%;
+ height:100%
+}
\ No newline at end of file
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index d005bde..03fc753 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -26,7 +26,7 @@ Page({
txmon: 0,
byquan: 0,
yuer: 0,
- is_no_plus: 1,
+ is_no_plus: 0, //是否开通等级卡,或者体验等级卡
currentPage: 1,
recommend_list: [],
tc_hide: true,
@@ -47,13 +47,13 @@ Page({
add_card_data: '', //等级卡的内容
getusercode_vailtime:10,//会员二维码时效
hiddenCS: true,
-
is_show_recommend:false,
-
has_rj:0,
rfmName:'成长值',
- is_close_chuzhi:0
-
+ is_close_chuzhi:0,
+ brcode:'',
+ showvipcode:false,
+ pshow:0
},
goto_nav: function (e) {
@@ -118,8 +118,11 @@ Page({
*/
onShow: function () {
+
var _that=this;
+ this.init_load()
+
//-- 看一下隐私政策要不要显示 --
var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
if (privacy_pop) {
@@ -173,6 +176,8 @@ Page({
if (item.end_time < now) {
th.setData({ is_no_plus: 0 })
}
+ }else if(item.is_sy == 1){
+ th.setData({ is_no_plus: 1 })
}
}
}
@@ -200,7 +205,6 @@ Page({
if (e != undefined && e != null && e.mobile) {
-
if (e.card_field != '' && e.card_field != null && e.card_field != undefined && e.card_expiredate) {
var now = ut.gettimestamp();
var str = e.card_expiredate.replace(/-/g, '/');;
@@ -438,6 +442,8 @@ Page({
if (cz_vals < im.BuyGradeSum && need_money == 0) {
need_money = im.BuyGradeSum;
obj.need_money = need_money;
+ obj.nextGradeName=im.GradeName;
+ break;
}
}
@@ -475,6 +481,9 @@ Page({
//th.setData({ qy_list: arr, need_money: need_money});
obj.qy_list = arr;
th.setData(obj);
+ obj.is_init=1;
+ obj.old_qy_list = arr_data;
+ th.setData({qy_data:obj})
}
})
}
@@ -537,13 +546,16 @@ Page({
goods_list.get_list();
}
- }, 1000)
- }
-
+ }, 1200)
+ }
+ setTimeout(()=>{
+ th.setData({ pshow:1 })
+ },500)
},
+
//获取会员权益等级是否升级
getVison(){
let isRfm = wx.getStorageSync('isRfm')
@@ -595,7 +607,11 @@ Page({
url: "/packageD/pages/error/error?msg=还未购买小程序",
});
},
-
+ showtext:function(){
+ this.setData({
+ showvipcode:true
+ })
+ },
/**
* 页面上拉触底事件的处理函数
*/
@@ -654,11 +670,13 @@ Page({
var val = that.data.userInfo.mobile + "|" +getnowtime+"|"+that.data.getusercode_vailtime;
val = "^" + ut.base64_encode(val);
- qrcode('qrcode', val, 480, 480, that);
+ qrcode('qrcode', val, 350, 350, that);
+ barcode('barcode', that.data.userInfo.userQrcode, 480,140);
that.setData({
tc_hide: false,
+ brcode:that.data.userInfo.userQrcode
});
- }
+ }
}
})
@@ -940,7 +958,7 @@ Page({
var giftbagid = res.data.data.giftBagId;
var actId = res.data.data.id;
var actImg = res.data.data.actImg;
- th.setData({ giftbagid: giftbagid, actId: actId, actImg: actImg });
+ th.setData({ giftbagid: giftbagid, actId: actId, actImg: actImg, b_gift:{ giftbagid: giftbagid, actId: actId, actImg: actImg } });
th.setData({ is_banner: 1 });
}
@@ -1171,6 +1189,45 @@ Page({
});
},
+ //同步初始加载
+ async init_load() {
+ var th = this;
+ //因为营销版本的功能包含了自定义模板的功能,是同时的
+ //读取全局是否有弄自定义模板
+ await getApp().request.promiseGet("/api/weshop/store_module/gets/"+os.stoid+"/1/8", {1: 1}).then(res => {
+ var data = res.data.data;
+ if (data && data.length) {
+ var temp_data = data[0];
+ var t_arr = JSON.parse(temp_data.json_str);
+
+ let obj={
+ share_title: temp_data.page_title,
+ template_arr: t_arr,
+ isTemplate: 1,
+ bgcolor_t: temp_data.bkcolor,
+ pshow:1
+ };
+
+ //---如果有设定顶部的颜色的时候--
+ if (temp_data.top_color && temp_data.top_color != 'null') {
+ var top_w_color = "#ffffff";
+ if (temp_data.top_word_color) {
+ top_w_color = temp_data.top_word_color
+ }
+ wx.setNavigationBarColor({
+ frontColor: top_w_color, // 必写项
+ backgroundColor: temp_data.top_color, // 必写项
+ })
+ obj.topwColor=top_w_color;
+ obj.topbgColor=temp_data.top_color;
+ }
+
+ th.setData(obj);
+
+ }
+ })
+ },
+
diff --git a/pages/user/index/index.json b/pages/user/index/index.json
index 6b8a9e0..0e1c893 100644
--- a/pages/user/index/index.json
+++ b/pages/user/index/index.json
@@ -3,7 +3,14 @@
"pop_txt": "/components/userqy_pop_up/userqy_pop_up",
"goods_recommend": "/components/goods_list/goods_list",
"privacy_pop": "/components/privacy_pop/privacy_pop",
- "com_top_nav": "/components/com_top_nav/com_top_nav"
+ "com_top_nav": "/components/com_top_nav/com_top_nav",
+ "advertising":"/components/diy_advertising/diy_advertising",
+ "assist":"/components/diy_assist/diy_assist",
+ "diy_user_info":"/components/diy_user_info/diy_user_info",
+ "diy_user_order":"/components/diy_user_order/diy_user_order",
+ "diy_user_my_rights":"/components/diy_user_my_rights/diy_user_my_rights",
+ "diy_user_tools_services":"/components/diy_user_tools_services/diy_user_tools_services"
+
},
"navigationBarTitleText": "会员中心",
"navigationStyle": "custom"
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index fb52e1a..a5ffb04 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -5,387 +5,469 @@
-
-
-
-
-
-
-
-
-
-
-
- {{pulscardname}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 为你推荐
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提供技术支持
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{pulscardname}}
+
+
-
-
-
-
- {{userInfo.nickname}}
-
- {{GradeName}}
+
+
+ {{userInfo.nickname}}
+
+ {{GradeName}}
+
+
+
+
+
+
+
+
+ {{" "}}
+ {{rfmName}}
+ {{cz_val}} / {{need_money}}
+
+
+ {{" "}}
+ {{rfmName}} {{cz_val}}
+
+
+
+
+
+ 请点击注册
+
+
+
+
+
+ 会员卡
+
+
+ {{rfmName}}
-
-
- {{" "}}
- {{rfmName}}
- {{cz_val}} / {{need_money}}
-
-
- {{" "}}
- {{rfmName}} {{cz_val}}
-
+
+
+
+
-
-
+ 0/0
+
+
+ {{yuer?yuer:0}}
+ 余额
+
+
+
+ {{udata.Balance?udata.Balance:0}}
+ 储值款
+
+
-
-
- 请点击注册
-
+ {{udata.Integral?udata.Integral:0}}
+ 积分
+
+ {{udata.CashCount+byquan?udata.CashCount+byquan:0}}
+ 优惠券
+
+
+
-
-
-
- 会员卡
-
-
- {{rfmName}}
+
+
+
+
+
+ 加入plus会员预计可省3031元
+
+
+ 立即开通
+
+
+
-
-
-
-
+
+
+
+
+ 加入plus会员预计可省3031元
+
+
+ 立即续费
+
+
+
- 0/0
-
-
- {{yuer?yuer:0}}
- 余额
+
+
+
+
+
+
+
+ 我的订单
+
+
+ 您有{{countDadaOrder}}个同城配送订单
-
-
- {{udata.Balance?udata.Balance:0}}
- 储值款
+
+ 更多
+
+
+
+
+
+
+
+ 待付款
+ {{toji.wait_pay}}
-
- {{udata.Integral?udata.Integral:0}}
- 积分
+
+
+ 待发货
+ {{toji.wait_send}}
- {{udata.CashCount+byquan?udata.CashCount+byquan:0}}
- 优惠券
+
+
+ 待收货
+ {{toji.wait_receive}}
+
+
+
+ 待评论
+ {{toji.wait_pj}}
+
+
+
+
+ 售后/退款
+
-
-
-
-
-
-
-
-
- 加入plus会员预计可省3031元
-
- 立即开通
-
-
-
+
-
-
-
-
- 加入plus会员预计可省3031元
-
-
- 立即续费
-
-
-
-
-
-
-
-
-
-
-
- 我的订单
+
+
+
+
+
+
+
+ 我的权益
+
+
+
+ 更多
+
+
+
+
+
-
- 您有{{countDadaOrder}}个同城配送订单
-
-
- 更多
-
-
-
-
-
-
-
- 待付款
- {{toji.wait_pay}}
-
-
-
- 待发货
- {{toji.wait_send}}
-
+
+
+
-
-
- 待收货
- {{toji.wait_receive}}
-
-
-
- 待评论
- {{toji.wait_pj}}
-
-
-
-
- 售后/退款
-
-
+
+
+
-
-
+
-
+
+
-
-
-
-
-
-
- 我的权益
-
-
-
- 更多
-
-
-
-
-
-
+
+
+
+ {{item.PrivilegeName}}
+
+
+
-
-
-
+
-
-
+
+
+
+
+
+
+ 未找到数据
+
-
-
-
-
-
-
-
- {{item.PrivilegeName}}
-
-
-
-
-
-
-
+
+
+
+
+
+
-
- 未找到数据
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 工具与服务
-
-
-
-
-
-
-
-
-
-
-
-
-
- PLUS会员
-
-
-
-
-
- 助力活动
-
-
-
-
-
- 我的权益
-
-
-
-
-
- 套盒商品
-
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
- {{item.name}}
-
+
+
+
+
+ 工具与服务
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PLUS会员
+
+
+
+
+
+ 助力活动
+
+
+
+
+
+ 我的权益
+
+
+
+
+
+ 套盒商品
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
+
+ 联系客服
+
+
+
+
+
+
+ 收入卡包
+
+
+
-
-
-
-
-
-
-
- 联系客服
-
+
-
-
-
-
- 收入卡包
-
-
-
-
-
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
- 为你推荐
-
-
-
+
+
+
+
+
+
+ 为你推荐
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+ 提供技术支持
+
-
-
-
-
-
-
-
-
-
-
- 提供技术支持
-
-
-
-
-
-
-
-
-
-
-
- {{userInfo.nickname}}
-
-
+
+
+
+
+
+
+
+
+
+ {{userInfo.nickname}}
+
+
+
+ {{userInfo.address}}
+
+
+
+
+
+
+
+
+
+
+
+ {{brcode}}
+
+
+ 点击可查看条形数据
- {{userInfo.address}}
-
-
-
-
- 前台收银扫此二维码,即可享受优惠!
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/pages/user/index/index.wxss b/pages/user/index/index.wxss
index 6d8193f..3c0992c 100644
--- a/pages/user/index/index.wxss
+++ b/pages/user/index/index.wxss
@@ -597,11 +597,11 @@
.m_ta {
margin-top: 50rpx;
-}
+}
.g_img {
- width: 480rpx;
- height: 480rpx;
+ width: 350rpx;
+ height: 350rpx;
}
.s_sao {
@@ -778,4 +778,10 @@ button::after {
width: 25rpx;
height: 25rpx;
margin-right: 5rpx;
+}
+.canvas_box{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ /* margin-top: 20rpx; */
}
\ No newline at end of file
diff --git a/pages/user/plus/plus.js b/pages/user/plus/plus.js
index 8dd2b15..b546a81 100644
--- a/pages/user/plus/plus.js
+++ b/pages/user/plus/plus.js
@@ -243,7 +243,7 @@ Page({
getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + app_d.user_id, {
success: function (e) {
var userInfo = e.data.data;
- if (userInfo && userInfo['card_field'] && !getApp().globalData.is_card_back) {
+ if (userInfo && userInfo['card_field']) {
var u_url = "/packageE/pages/user/cardinfo/cardinfo";
wx.reLaunch({
url: u_url
@@ -490,7 +490,6 @@ Page({
-
//--如果有邀请码,和营业员的情况下--
if (req.recommon || req.serviceman) {
@@ -532,8 +531,20 @@ Page({
} else {
t_pay.set_pay_url('/api/weshop/plus/create/plus/order');
t_pay.pay(req, th.success, function (msg) {
- if(!msg) msg='支付失败';
- getApp().my_warnning(msg, 0, th);
+
+ if( typeof msg === 'object' && msg !== null && msg.code==-2){
+ wx.showModal({
+ title: msg.msg,
+ showCancel: !1,
+ complete: function () {
+ getApp().goto('/packageE/pages/user/cardinfo/cardinfo');
+ }
+ });
+ }else{
+ if(!msg) msg='支付失败';
+ getApp().my_warnning(msg, 0, th);
+ }
+
th.setData({
is_select:0,
focus:true,
diff --git a/utils/pay2.js b/utils/pay2.js
index 25decb8..c87aee5 100644
--- a/utils/pay2.js
+++ b/utils/pay2.js
@@ -88,7 +88,12 @@ module.exports = {
i.weixinPay(t.data.data, succ, fail);
}
}
- }else{
+ }
+ else if(t.data.code==-2 && dd.rechargeType==3){
+ i.wx_paying=0;
+ "function" == typeof fail && fail(t.data);
+ }
+ else{
i.wx_paying=0;
"function" == typeof fail && fail(t.data.msg);
}