diff --git a/app.js b/app.js
index cc2b2b6..38e250f 100644
--- a/app.js
+++ b/app.js
@@ -72,7 +72,7 @@ App({
room_id:null, //直播间分享的房间ID
room_goods_id:null, //直播间分享的商品ID
-
+
},
auth: o,
request: a,
@@ -106,7 +106,12 @@ App({
app.globalData.user_id= user.user_id;
}
wx.setStorageSync("userinfo",user);
- }
+ }else{
+ user=null;
+ app.globalData.userInfo=null;
+ app.globalData.user_id= 0;
+ wx.setStorageSync("userinfo",null);
+ }
})
}
}
@@ -246,6 +251,7 @@ App({
//----------------获取商家开启的物流--------------------
getwuliu: function (t, o){
+ this.globalData.wuliu=null;
var th = this, st = this.globalData.setting;
this.globalData.wuliu && !o ?
"function" == typeof t && t(this.globalData.wuliu) : a.get("/api/weshop/storeshipping/list", {
@@ -612,9 +618,7 @@ App({
this.globalData.config2=null; //清除config2的缓存
this.globalData.config=null; //清除config的缓存
this.globalData.gr_index=0; //商品分组的序列
- for(var i = 1; i < 50; i++) {
- clearInterval(i);
- }
+
},
clear_word:function (word) {
@@ -716,7 +720,7 @@ App({
});
},
-
+
});
diff --git a/app.json b/app.json
index 2a3e288..88cba8b 100644
--- a/app.json
+++ b/app.json
@@ -154,7 +154,11 @@
"pages/user/view_comment/view_comment",
"pages/user/add_comment/add_comment",
"pages/user/user_coupon/user_coupon",
- "pages/user/buyDetails/buyDetails"
+ "pages/user/buyDetails/buyDetails",
+ "pages/evaluate/evaluate",
+ "pages/evaluate_list/evaluate_list",
+ "pages/luckactivity/luckinfo/luckinfo",
+ "pages/luckactivity/index/index"
]
}
diff --git a/app.wxss b/app.wxss
index 51e5315..9b0bd37 100644
--- a/app.wxss
+++ b/app.wxss
@@ -25,6 +25,9 @@
.pdt10 {
padding-top: 10rpx;
}
+.pdt12 {
+ padding-top: 12rpx;
+}
.pdb10 {
padding-bottom: 10rpx;
}
@@ -84,6 +87,11 @@
padding-right: 40rpx;
}
+.w20 {
+ width: 20%;
+ box-sizing: border-box;
+}
+
.w25 {
width: 25%;
box-sizing: border-box;
@@ -117,6 +125,10 @@
color: #c7c7c7;
}
+.c-7b {
+ color: #7b7b7b;
+}
+
.c-d {
color: #ddd;
}
@@ -129,7 +141,7 @@
color: #555;
}
-.c7b {
+.c-7b {
color: #7b7b7b;
}
@@ -165,6 +177,7 @@
margin-left: 20rpx;
}
+
.mgb20 {
margin-bottom: 20rpx;
}
@@ -179,6 +192,10 @@
margin-right: 20rpx;
}
+.mgt30 {
+ margin-top: 30rpx;
+}
+
.h68 {
height: 68rpx;
}
@@ -561,9 +578,7 @@ background: #b9b9b9;
color: #333;
}
-.xc-black3{
-color: #333;
-}
+
.xc-fixed{
position: fixed;
@@ -627,6 +642,9 @@ background: #ffe3e2;
.fs40 {
font-size: 40rpx !important;
}
+.fs50 {
+ font-size: 50rpx !important;
+}
.ai_c {
align-items: center;
}
@@ -671,9 +689,9 @@ background: #ffe3e2;
/* 图标字体(ty) */
@font-face {
font-family: 'iconfont'; /* Project id 2054717 */
- src: url('//at.alicdn.com/t/font_2054717_vx6pr6zmhth.woff2?t=1623117016358') format('woff2'),
- url('//at.alicdn.com/t/font_2054717_vx6pr6zmhth.woff?t=1623117016358') format('woff'),
- url('//at.alicdn.com/t/font_2054717_vx6pr6zmhth.ttf?t=1623117016358') format('truetype');
+ src: url('//at.alicdn.com/t/font_2054717_l5nx11noek8.woff2?t=1626055955086') format('woff2'),
+ url('//at.alicdn.com/t/font_2054717_l5nx11noek8.woff?t=1626055955086') format('woff'),
+ url('//at.alicdn.com/t/font_2054717_l5nx11noek8.ttf?t=1626055955086') format('truetype');
}
.iconfont {
@@ -684,6 +702,26 @@ background: #ffe3e2;
-moz-osx-font-smoothing: grayscale;
}
+.icon-zhuanpan:before {
+ content: "\e642";
+}
+
+.icon-tel:before {
+ content: "\e610";
+}
+
+.icon-liwu:before {
+ content: "\e64e";
+}
+
+.icon-share:before {
+ content: "\e785";
+}
+
+.icon-shuangjiantouxia:before {
+ content: "\e660";
+}
+
.icon-plyy:before {
content: "\e729";
}
diff --git a/components/diy_store_select/diy_store_select.wxss b/components/diy_store_select/diy_store_select.wxss
index 105ad22..9fc3390 100644
--- a/components/diy_store_select/diy_store_select.wxss
+++ b/components/diy_store_select/diy_store_select.wxss
@@ -1,163 +1,212 @@
-.store_sele{width: 100%;z-index: 8; height: 88rpx; padding: 0 15rpx;position: fixed; color: white;
- top: 0; left: 0; background-color: #ff7295; font-size: 30rpx; }
-
- .store_sele1{ height: 100rpx; padding: 0 15rpx; color: #666;background-color: #fff; font-size: 32rpx;}
-
-
-.logo_box{ width: 64rpx; height:64rpx;margin-right: 15rpx; }
+.store_sele {
+ width: 100%;
+ z-index: 8;
+ height: 60rpx;
+ padding: 0 15rpx;
+ /* position: fixed; */
+ color: white;
+ /* top: 0;
+ left: 0; */
+ background-color: #ff7295;
+ font-size: 26rpx;
+ box-sizing: border-box;
+}
+
+.store_sele1 {
+ height: 100rpx;
+ padding: 0 15rpx;
+ color: #666;
+ background-color: #fff;
+ font-size: 32rpx;
+}
+
+
+.logo_box {
+ width: 48rpx;
+ height: 48rpx;
+ margin-right: 10rpx;
+}
+
.pd-view {
- height: 80rpx;
+ /* height: 80rpx; */
+}
+
+.circle {
+ border-radius: 50%;
}
-.circle{ border-radius: 50%;}
/*-- 门店选择 --*/
/* 选择门店的弹窗 */
-.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%;
-
-}
-
-.popup-frame{
-position: fixed;
-bottom:110rpx;
-z-index: 20;
-background: white;
-width: 100%;
-border-radius: 20rpx 20rpx 0 0;
-height: 72%;
-
-}
-.popup-top{
- border-bottom: 1rpx solid #eee;
- height: 155rpx;
- width: 95%;
- margin: auto;
- line-height: 155rpx;
-
-}
-.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%;
+
+}
+
+.popup-frame {
+ position: fixed;
+ bottom: 110rpx;
+ z-index: 20;
+ background: white;
+ width: 100%;
+ border-radius: 20rpx 20rpx 0 0;
+ height: 72%;
+
+}
+
+.popup-top {
+ border-bottom: 1rpx solid #eee;
+ height: 155rpx;
+ width: 95%;
+ margin: auto;
+ line-height: 155rpx;
+
+}
+
+.bg_rights {
+ border-top: 2rpx solid;
+ border-right: 2rpx solid;
+ transform: rotate(45deg);
+ display: inline-block;
+ width: 15rpx;
+ height: 15rpx;
+ border-color: #da0b31;
}
+
.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;
-
-}
-.store-list{
- width: 95%;
- height: 72%;
- overflow-y: scroll;
- margin: auto;
-}
-.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;
-}
- .xc-hooks{
- width: 30rpx;
- height: 30rpx;
- border: 1rpx solid #999;
- }
- .address-frame{
- width: 93%;
-margin-left: 7rpx;
-
- }
- .nearby_store{
-margin-left: 17rpx;
- }
- .address_name{
- margin-right: 10rpx;
-
- }
- .address-val{
- height: 38rpx;
-line-height: 38rpx;
-
- }
- .store-bottom{
- width: 85%;
- margin: auto;
- height: 70rpx;
- }
- .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;
- }
- .store-bottom-frame{
- width: 95%;
- margin: auto;
- }
-
-
- /* 门店分类列表 */
- .sort_store_list{
- height: 82%;
- overflow: hidden;
- overflow-y: scroll;
- width: 95%;
- margin: auto;
- }
- .sort_store_list .sort-store-frame{
- width: 100%;
- height: 100rpx;
- line-height:100rpx;
- border-bottom: 1rpx solid #eee;
-
- }
- .sort_store_list .sort-store-frame .sort-store{
- width: 94.5%;
- margin: auto;
- }
- .ai_center{ align-items: center;}
\ No newline at end of file
+ position: absolute;
+ right: 30rpx;
+ top: -15rpx;
+ height: 25rpx;
+
+}
+
+.choose_more {
+ margin-top: 40rpx;
+ margin-right: 20rpx;
+
+}
+
+.choose_mores {
+ margin-top: 30rpx;
+ margin-right: 15rpx;
+
+}
+
+.store-list {
+ width: 95%;
+ height: 72%;
+ overflow-y: scroll;
+ margin: auto;
+}
+
+.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;
+}
+
+.xc-hooks {
+ width: 30rpx;
+ height: 30rpx;
+ border: 1rpx solid #999;
+}
+
+.address-frame {
+ width: 93%;
+ margin-left: 7rpx;
+
+}
+
+.nearby_store {
+ margin-left: 17rpx;
+}
+
+.address_name {
+ margin-right: 10rpx;
+
+}
+
+.address-val {
+ height: 38rpx;
+ line-height: 38rpx;
+
+}
+
+.store-bottom {
+ width: 85%;
+ margin: auto;
+ height: 70rpx;
+}
+
+.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;
+}
+
+.store-bottom-frame {
+ width: 95%;
+ margin: auto;
+}
+
+
+/* 门店分类列表 */
+.sort_store_list {
+ height: 82%;
+ overflow: hidden;
+ overflow-y: scroll;
+ width: 95%;
+ margin: auto;
+}
+
+.sort_store_list .sort-store-frame {
+ width: 100%;
+ height: 100rpx;
+ line-height: 100rpx;
+ border-bottom: 1rpx solid #eee;
+
+}
+
+.sort_store_list .sort-store-frame .sort-store {
+ width: 94.5%;
+ margin: auto;
+}
+
+.ai_center {
+ align-items: center;
+}
diff --git a/components/full_screen/filter.wxs b/components/full_screen/filter.wxs
deleted file mode 100644
index 68e2458..0000000
--- a/components/full_screen/filter.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-var format = function (text) {
-
- if (!text) {
- return
- }
- var reg = getRegExp('\\\\n', 'g')
- return text.replace(reg, '\n')
-}
-
-module.exports = {
- format: format
-}
diff --git a/components/full_screen/full_screen.js b/components/full_screen/full_screen.js
deleted file mode 100644
index 81f7d8f..0000000
--- a/components/full_screen/full_screen.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// components/userqy_pop_up/userqy_pop_up.js
-var o = getApp().globalData.setting
-Component({
- /**
- * 页面的初始数据
- */
- data: {
- control: 1,
- is_full_screen_show:0, //全屏显示
- sec_show:3, //倒计时的秒数
- full_ad:null, //全屏广告
- url:o.imghost,
- full_screen:0,
- is_full_screen_men:1,
- hidden:0,
- },
-
- pageLifetimes:{
- hide: function() {
- // 页面被隐藏
- clearInterval(this.data.full_screen);
- },
- },
-
- ready: function () {},
- properties: {},
- methods: {
- close_full_screen(){
- this.setData({is_full_screen_show:0,sec_show:0});
- },
- //-- 跳转到满屏广告的链接 --
- go_full_ad(){
- if(!this.data.full_ad) return false;
- if(!this.data.full_ad.ad_weapplink) return false;
- getApp().goto(this.data.full_ad.ad_weapplink);
- },
- get_the_full_screen(){
- if(this.data.full_ad) {
- return false;
- }
- var th=this;
- //获取全屏的广告
- getApp().request.promiseGet("/api/weshop/ad/page?pid=1001&store_id=" + o.stoid,{
- data: { enabled: 1 }
- }).then(res=>{
- //判断是不是有全屏广告
- if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){
- th.setData({
- is_full_screen_show:1,
- full_ad:res.data.data.pageData[0],
- })
- //--定时关闭--
- th.data.full_screen=setInterval(function(){
- if(!th.data.sec_show) {
- clearInterval(th.data.full_screen);
- th.close_full_screen();
- return false;
- }
- th.data.sec_show--;
- th.setData({sec_show:th.data.sec_show});
- },1000)
-
- }
- })
- }
- },
-
-})
\ No newline at end of file
diff --git a/components/full_screen/full_screen.wxml b/components/full_screen/full_screen.wxml
deleted file mode 100644
index ce01065..0000000
--- a/components/full_screen/full_screen.wxml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- 跳过 {{sec_show}}
-
-
-
-
diff --git a/components/full_screen/full_screen.wxss b/components/full_screen/full_screen.wxss
deleted file mode 100644
index f5220b9..0000000
--- a/components/full_screen/full_screen.wxss
+++ /dev/null
@@ -1,16 +0,0 @@
-.full_screen{
- position: fixed;left: 0;top: 0;
- z-index: 1000000000000;
- background-color: rgba(0,0,0,0.4);
- width: 100%;
- height: 100%;
- background-position: center;
- background-size: 100% 100%;
- background-repeat: no-repeat;
-}
-.skip_box{
- float: right; margin-top: 10rpx; margin-right: 10rpx;
- background-color: gainsboro; width: 120rpx;
- height: 48rpx; font-size: 28rpx; line-height: 48rpx;
- text-align: center; border-radius: 20rpx;
- }
\ No newline at end of file
diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml
index 7352331..cdd2466 100644
--- a/components/goods_list/goods_list.wxml
+++ b/components/goods_list/goods_list.wxml
@@ -4,31 +4,34 @@
-
-
+
+
-
+
{{item.goods_name}}
-
- {{item.prom_integral}}积分
- +
-
-
- ￥
- {{item.prom_price}}
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
+
+
+ {{item.prom_integral}}积分
+ +
+
+
+ ￥
+ {{item.prom_price}}
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
@@ -48,7 +51,7 @@
-
+
￥
@@ -64,7 +67,7 @@
{{filter.toFix(item.shop_price,2)}}
-
+
￥
@@ -108,7 +111,7 @@
{{filter.toFix(item.shop_price,2)}}
-
+
￥
@@ -119,7 +122,7 @@
-
+
@@ -127,14 +130,14 @@
{{filter.toFix(item.shop_price,2)}}
-
+
￥
{{item.market_price}}
-
+
diff --git a/components/goods_list/goods_list.wxss b/components/goods_list/goods_list.wxss
index 31d0361..4722ef3 100644
--- a/components/goods_list/goods_list.wxss
+++ b/components/goods_list/goods_list.wxss
@@ -1,6 +1,10 @@
.collects {
- margin-top: 40rpx;
- margin-bottom: 40rpx;
+ /* margin-top: 40rpx; */
+ /* margin-bottom: 40rpx; */
+}
+
+.pdt10 {
+ padding-top: 10rpx;
}
.ai-center{
@@ -82,40 +86,53 @@
.goods_name {
height: 62rpx;
- margin-top: 6rpx;
+ /* margin-top: 6rpx; */
line-height: 30rpx;
}
.hang {
- width: 100%;
- margin: auto;
- padding-left: 21rpx;
+ /* width: 100%; */
+ /* margin: auto;
+ padding-left: 21rpx; */
+ display: flex;
+ flex-wrap: wrap;
+ /* margin: 0 auto; */
+ padding: 0 20rpx;
+ box-sizing: border-box;
+ /* justify-content: space-evenly; */
}
.hang .collect {
- width: 347rpx;
- height: 520rpx;
+ width: calc((100% - 20rpx) / 2);
+ /* height: 520rpx; */
border-radius: 25rpx;
- border: 1rpx solid rgb(214, 214, 214);
+ border: 2rpx solid #ebedf0;
overflow: hidden;
- margin-right: 14rpx;
- margin-bottom: 5rpx;
+ box-sizing: border-box;
+ margin-top: 20rpx;
+ /* margin-right: 14rpx;
+ margin-bottom: 5rpx; */
+}
+
+.hang .collect:nth-child(2n+1) {
+ margin-right: 20rpx;
}
.collect .bottom {
- padding: 0rpx 20rpx;
+ padding: 20rpx;
}
.collect .sp {
width: 100%;
- height: 326rpx;
+ height: 340rpx;
+ display: block;
}
.collect .money {
- margin-top: 28rpx;
+ /* margin-top: 28rpx;
margin-bottom: 8rpx;
line-height: 28rpx;
- align-items: baseline;
+ align-items: baseline; */
}
.collect .money view {
@@ -177,7 +194,7 @@
.nothing .Foil {
width: 80rpx;
height: 2rpx;
- background-color: rgb(138, 138, 138);
+ background-color: #ebedf0;
}
.line_th {
diff --git a/components/my-qrcode/my-qrcode.js b/components/my-qrcode/my-qrcode.js
new file mode 100644
index 0000000..27a6dca
--- /dev/null
+++ b/components/my-qrcode/my-qrcode.js
@@ -0,0 +1,46 @@
+// pages/user/yhq/qr_code/qr_code.js
+const {
+ barcode,
+ qrcode
+} = require('../../utils/index.js')
+
+Component({
+ data: {
+ q_show:0,
+ object:null,
+ index:0,
+ is_fw:0,
+
+ barcode_canvas:null,
+ qrcode_canvas:null,
+ },
+ properties: {
+ // 这里定义了innerText属性，属性值可以在组件使用时指定
+ },
+ ready: function () {
+ },
+
+ methods: {
+ //关闭
+ close: function (e) {
+ this.setData({q_show: 0,barcode_canvas:null,qrcode_canvas:null });
+ this.triggerEvent('close',{},{bubbles: true});
+ },
+
+ //打开
+ open:function (e) {
+ this.data.index++;
+ var list=[{index:this.data.index }];
+
+ this.setData({q_show: 1,object:e,barcode_canvas:list,qrcode_canvas:list,is_fw:e.is_fw });
+ var val=e.val;
+
+ // barcode('barcode'+this.data.index,val, 620, 160,this);
+ qrcode('qrcode'+this.data.index, val, 520, 520,this);
+ }
+ },
+
+
+
+
+})
\ No newline at end of file
diff --git a/components/full_screen/full_screen.json b/components/my-qrcode/my-qrcode.json
index a88fc2f..a74b8d1 100644
--- a/components/full_screen/full_screen.json
+++ b/components/my-qrcode/my-qrcode.json
@@ -1,4 +1,4 @@
{
- "component": true,
- "usingComponents": {}
+ "component": true,
+ "usingComponents": {}
}
\ No newline at end of file
diff --git a/components/my-qrcode/my-qrcode.wxml b/components/my-qrcode/my-qrcode.wxml
new file mode 100644
index 0000000..8406d34
--- /dev/null
+++ b/components/my-qrcode/my-qrcode.wxml
@@ -0,0 +1,10 @@
+
+
+
+
+ 兑换码：{{object.val}}
+ 请向店员出示二维码核销兑换
+
+
+
+
diff --git a/components/my-qrcode/my-qrcode.wxss b/components/my-qrcode/my-qrcode.wxss
new file mode 100644
index 0000000..ae090c1
--- /dev/null
+++ b/components/my-qrcode/my-qrcode.wxss
@@ -0,0 +1,122 @@
+@import '../../app.wxss';
+
+.xc-pop-up{
+ position:fixed;
+ z-index:5;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+}
+
+
+.xc-obscuration{
+ position: fixed;
+ left: 0;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ z-index: 11;
+ background: rgba(0,0,0,0.4);
+ width: 100%;
+ height: 100%;
+
+
+
+}
+
+ /* Y */
+.xc-qr-frame{
+ /* width:90%;
+ min-height: 696rpx;
+ background: #fff;
+ z-index: 55;
+ position: fixed;
+ top:180rpx; */
+ /* height: auto; */
+ /* padding-bottom:20rpx; */
+ /* left:35rpx; */
+ /* overflow: hidden;
+ border-radius: 16rpx; */
+}
+
+/* 二维码和条形码的边框Y */
+.barqrcode{
+ background-color: white;
+ border-radius: 16rpx;
+ padding: 0 40rpx 40rpx;
+ text-align: center;
+}
+/* 点击条形Y */
+.barcode {
+ /* background-color: white;
+ border-radius: 12rpx; */
+}
+canvas{
+ width:100%;
+ height:55px;
+display:block;
+
+}
+.q_code{
+ color: #333;
+}
+
+
+/* 二维码边框Y*/
+.qrcode_rim {
+ width: 550rpx;
+ height:544rpx;
+display:flex;
+flex-direction:column;
+position: absolute;
+left: 75rpx;
+top: 5rpx;
+
+}
+.qrcode{
+ width: 520rpx;
+ height: 520rpx;
+}
+.r-code{
+ /* font-size:28rpx;
+ padding-left: 25rpx; */
+ /* margin-top: -5.5rpx; */
+
+}
+
+.shut{
+ color: white;
+ text-align: right;
+ padding-bottom: 30rpx;
+ position: relative;
+}
+
+
+.icon-close {
+ font-size: 48rpx;
+}
+
+.shut::after {
+ content: '';
+ width: 2rpx;
+ height: 32rpx;
+ background-color: white;
+ position: absolute;
+ bottom: 0;
+ right: 24rpx;
+}
+
+.mt{ margin-top:130rpx}
+.mts{ margin-top:70rpx}
+.flex{
+ display: flex;
+ justify-content:center;
+}
+
+.code_show{
+ text-align: center;position: relative; left: -20rpx;
+}
+
+.c-9 {
+ color: #999;
+}
\ No newline at end of file
diff --git a/components/share/share.js b/components/share/share.js
index 4058661..ab3e5f7 100644
--- a/components/share/share.js
+++ b/components/share/share.js
@@ -12,7 +12,10 @@ Component({
},
set_type(type){
this.setData({type:type})
- }
+ },
+ send() {
+ this.triggerEvent('send',{},{bubbles: true});
+ },
}
})
\ No newline at end of file
diff --git a/components/share/share.wxml b/components/share/share.wxml
index 7e71849..7bc7b89 100644
--- a/components/share/share.wxml
+++ b/components/share/share.wxml
@@ -2,7 +2,7 @@
-
-
+
销量：{{data.sales_sum}}
有效天数：{{data.validDays?data.validDays:'不限'}}
@@ -55,7 +55,7 @@
选择门店
-
+
更多门店
@@ -86,28 +86,42 @@
-
-
- {{store_config.service_bz}}
-
+
+
+
+ {{store_config.service_bz}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
项目名称
耗时(分)
手工费
次数
-
+
{{item.projectName}}
{{item.timeConsuming}}
{{item.money}}
@@ -143,29 +157,33 @@
-
-
-
-
-
- 客服
-
-
-
-
-
- {{cartGoodsNum}}
- 购物车
-
-
+
+
+
+
+
+
+ 客服
+
+
+
+
+
+ {{cartGoodsNum}}
+ 购物车
+
+
+
+
-
- 加入购物车
- 立即购买
-
+
+
+ 加入购物车
+ 立即购买
+
@@ -227,7 +245,7 @@
购买数量
- -
+ -
+
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxss b/packageA/pages/goodsInfo/goodsInfo.wxss
index 6173baa..c8f37aa 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxss
+++ b/packageA/pages/goodsInfo/goodsInfo.wxss
@@ -9,15 +9,19 @@ image {
display: flex;
justify-content: center;
width: 100%;
+ position: fixed;
+ top: 0;
+ z-index: 999;
/* height: 80rpx; */
/* margin-bottom: 20rpx; */
background-color: #fff;
+ border-top: 2rpx solid #ebedf0;
/* border-bottom: 1rpx #fafafa solid; */
}
.type-box {
width: 25%;
box-sizing: border-box;
- font-size: 28rpx;
+ font-size: 32rpx;
line-height: 76rpx;
padding: 0 20rpx;
text-align: center;
@@ -29,12 +33,14 @@ image {
display: flex;
justify-content: center;
width: 100%;
+ font-size: 26rpx;
}
.type-item-on {
color: #F95D74;
font-weight: bold;
/* border-bottom: 4rpx solid #F95D74; */
position: relative;
+ font-size: 30rpx;
}
.type-item-on:after {
content: '';
@@ -53,19 +59,21 @@ image {
}
.goods-title {
display: flex;
- justify-content: space-between; overflow: hidden;
+ justify-content: space-between;
+ /* overflow: hidden; */
/* height: 108rpx; */
}
.goods-name {
- width: 560rpx;
- line-height: 46rpx;
+ /* width: 560rpx; */
+ /* line-height: 46rpx; */
font-size: 32rpx;
font-weight: bold;
color: #333;
- margin-top: 30rpx;
- margin-bottom:30rpx;
+ /* margin-top: 30rpx;
+ margin-bottom:30rpx; */
flex: 1;
text-align: justify;
+ margin: 10rpx 0 20rpx;
}
.goods-collect {
@@ -89,13 +97,13 @@ image {
.goods-price {
font-size: 60rpx;
/* padding: 20rpx 34rpx; */
- padding:0rpx 34rpx;
+ /* padding:0rpx 34rpx; */
/* line-height: 60rpx; */
color: #999;
-
+ padding: 20rpx;
/* margin-top: 46rpx; */
- margin-top:26rpx;
- padding-bottom:20rpx;
+ /* margin-top:26rpx;
+ padding-bottom:20rpx; */
}
.prom-info {
@@ -111,13 +119,13 @@ image {
border-radius: 4rpx;
}
.market-price {
- display: flex;
- margin-left: -5rpx;
+ /* display: flex;
+ margin-left: -5rpx; */
}
.market-price .yuan{
- top:24rpx;
- font-size: 36rpx
+ /* top:24rpx; */
+ font-size: 30rpx
}
.market-price>view>text {
@@ -125,7 +133,8 @@ image {
}
.market-price>.yj{
- color: #999999; font-size: 26rpx;margin-left: 16rpx;position: relative;top:30rpx;
+ color: #999999; font-size: 24rpx;/* margin-left: 16rpx;position: relative;top:30rpx; */
+ display: inline-block;
}
.goods-price>.tm{ color: #999999; font-size: 26rpx;margin-top: 10rpx;}
@@ -134,6 +143,7 @@ image {
display: flex;
font-size: 24rpx;
justify-content: space-between;
+
}
.goods-detail .twen{
@@ -348,11 +358,11 @@ image {
}
.join-cart>view {
- width: 32%;
+ width: 29%;
}
.join-cart>.new_split {
- width: 17%;
+ width: 13%;
text-align: center;
padding: 0;
margin: 0;
@@ -551,29 +561,28 @@ border-radius: 0 56rpx 55rpx 0;
/* padding: 0 30rpx; */
font-size: 32rpx;
box-sizing: border-box;
- border-radius: 20rpx;
+ border-radius: 20rpx 20rpx 0 0;
/* height: 72%; */
}
-.spec-model .pding{padding: 0 30rpx;}
+.spec-model .pding{padding: 0 20rpx;}
.spec-goods {
padding: 30rpx 0 20rpx;
/* float: left; */
- display: flex;
width: 100%;
- border-bottom:2rpx solid #eee;
+ /* border-bottom:2rpx solid #eee; */
}
.spec-img {
- /* float: left; */
+ float: left;
height: 186rpx;
width: 186rpx;
border: 4rpx solid #eee
}
.spec-goods-info {
- /* float: left; */
+ float: left;
padding: 0 25rpx;
width: 400rpx;
}
@@ -608,17 +617,17 @@ border-radius: 0 56rpx 55rpx 0;
.quhuo{font-size: 30rpx; color: #000}
.b_num{
- display: flex;
- font-size: 30rpx;
- color: #333;
+ display: flex;font-size: 30rpx; color: #333;
+ justify-content: space-between;
+ align-items: center;
padding: 20rpx;
}
.count {
- position: fixed;
+ /* position: fixed; */
display: flex;
height: 50rpx;
- border: 1rpx solid #000;
+ /* border: 1rpx solid #000; */
font-size: 28rpx;
right: 30rpx;
}
@@ -636,11 +645,29 @@ border-radius: 0 56rpx 55rpx 0;
}
.spec_bt.act{background: #d60021;color: #fff;border: 1rpx solid #d60021;}
.sub {
- border-right: 1px solid #000;
+ /* border-right: 1px solid #000; */
+}
+.sub.active {
+ /* background-color: #ddd; */
+ color: #ccc;
+}
+
+.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;
}
.add {
- border-left: 1px solid #000;
+ /* border-left: 1px solid #000; */
}
.spec-btn {
@@ -662,14 +689,15 @@ border-radius: 0 56rpx 55rpx 0;
}
.spec-cart-btns {
- width: 92%;
+ /* width: 92%; */
line-height: 70rpx;
- margin: 20rpx auto;
- /* margin-top: 160rpx; */
- border-radius: 20rpx;
-/* position: fixed;
-bottom: 50rpx;
-left: 4%; */
+ /* margin: 0rpx auto;
+ margin-top: 160rpx; */
+ /* border-radius: 20rpx; */
+/* position: fixed; */
+/* bottom: 50rpx; */
+/* left: 4%; */
+ padding: 20rpx;
}
.spec-cart-btn {
@@ -763,8 +791,8 @@ left:31rpx;}
/*------拼单------*/
.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{ 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;}
@@ -786,7 +814,7 @@ left:31rpx;}
.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_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 }
@@ -808,14 +836,14 @@ left:31rpx;}
.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{/* 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;}
+.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: 26rpx;}
+.ckgd .arrow-one{width:14rpx;height:14rpx;border-color:#da0b31;/* margin-top:5rpx; */ margin:auto;}
.bview{
position: fixed; top:0; left:0; width: 100%; height: 100%;
background-color: rgba(0, 0, 0, 0.5);
@@ -842,65 +870,71 @@ left:31rpx;}
/*---多少人参加团--*/
.group {
- padding-top:25rpx;
- width: 91%;
- min-height: 92rpx;
- border-bottom:2rpx solid #eee;
- padding-bottom:25rpx;
+ padding-top:20rpx;
+ padding-bottom:20rpx;
+ width: 100%;
+ /* min-height: 92rpx; */
+ border-bottom: 2rpx solid #ebedf0;
}
.group .group-list {
-
- height: 90rpx;
- padding: 0 130rpx 0 100rpx;
- width: 470rpx;
+ display: flex;
+ align-items: center;
+ justify-content: space-around;
+ /* height: 90rpx; */
+ /* padding: 0 130rpx 0 100rpx; */
+ /* width: 470rpx;
- position: absolute;
+ position: absolute; */
}
.group .group-list .gtou {
- width: 80rpx;
- height: 80rpx;
- float: left;
+ width: 70rpx;
+ height: 70rpx;
+ /* float: left;
position: relative;
top: 6rpx;
- left: -96rpx;
+ left: -96rpx; */
}
.group .group-list .gtou image {
- width: 80rpx;
- height: 80rpx;
- border-radius: 200rpx;
- background-color: green;
+ display: block;
+ width: 100%;
+ height: 100%;
+ border-radius: 50%;
+ background-color: #f0f0f0;
}
.group .group-list .gdn {
- float: left;
+ width: 140rpx;
+ text-align: center;
+ /* float: left; */
font-size: 26rpx;
- line-height: 48rpx;
+ /* padding-left: 20rpx; */
+ /* line-height: 48rpx;
height: 48rpx;
width: 168rpx;
position: relative;
left: -80rpx;
- top:20rpx;
- font-weight:600;
+ top:20rpx; */
+ font-weight:bold;
}
.group .group-list .ghaicha {
- width:300rpx;
+ /* width:300rpx; */
font-size: 27rpx;
- margin-left:180rpx;
+ /* margin-left:180rpx;
top:13rpx;
- left:-3rpx;
- font-weight:600;
+ left:-3rpx; */
+ font-weight: bold;
}
.group .group-list .ghaicha .gred {
- height: 48rpx;
- width: 300rpx;
+ /* height: 48rpx;
+ width: 300rpx; */
}
.gsj {
@@ -911,9 +945,9 @@ left:31rpx;}
.group .group-list .cjt {
height:42rpx;
width: 137rpx;
- position: absolute;
+ /* position: absolute;
right: 4rpx;
- top:25rpx;
+ top:25rpx; */
line-height: 42rpx;
font-size: 24rpx;
color: #fff;
@@ -926,7 +960,7 @@ left:31rpx;}
.gbody {
background-color: white;
}
-.t_show{overflow: hidden; display: flex; width: 300rpx; color: #292929; line-height: 36rpx;font-size:26rpx;
+.t_show{/* overflow: hidden; */ display: flex; /* width: 300rpx; */ color: #292929; /* line-height: 36rpx; */font-size:26rpx;
}
.join-cart>view.set_width {
width:58%;
@@ -955,8 +989,8 @@ left:31rpx;}
white-space:nowrap;
}
-.tuwen_title{ height: 86rpx; background-color:#eeeeee; margin-bottom: 32rpx; position: relative;
- display: flex; justify-content: center;align-items: center; }
+.tuwen_title{ /* height: 86rpx; */ background-color:#eeeeee; /* margin-bottom: 32rpx; */ position: relative;
+ display: flex; justify-content: center;align-items: center; padding: 20rpx;}
.tuwen_title .g_line{
width:496rpx;
@@ -968,27 +1002,28 @@ left:31rpx;}
overflow: hidden; justify-content: center;align-items: center;
}
.tuwen_title .center_s image{ width: 34rpx; height: 26rpx; margin-right: 10rpx}
-.t_g_info{ margin: 0 34rpx;margin-bottom: 20rpx; display: flex; align-items: center }
+.t_g_info{ /* margin: 0 34rpx;margin-bottom: 20rpx; */ display: flex; align-items: center;padding: 20rpx; }
.red_shu{ width: 10rpx; height: 36rpx; background-color:#da0035; margin-right: 8rpx; }
-.tb-l{ line-height: 96rpx;}
-.table_s{ border:#e4e4e4 1rpx solid; width: 682rpx; margin: 0 34rpx;font-size: 30rpx;}
-.tb_item{display: flex; height: 96rpx; border-bottom: 1rpx solid #e4e4e4 }
-.item_left{width: 214rpx; height: 100%; background: #f9f9f9 ;border-right:1rpx solid #e4e4e4} .item_left text{ margin-left: 44rpx;}
-.item_right{width: 468rpx; height: 100%; overflow : hidden;white-space:nowrap;
- text-overflow: ellipsis;}
-.item_right text{ margin-left: 66rpx;}
+.tb-l{ /* line-height: 96rpx; */}
+.table_s{ border:#e4e4e4 1rpx solid; box-sizing: border-box;font-size: 26rpx;}
+.tb_item{display: flex; /* height: 96rpx; */ border-bottom: 1rpx solid #e4e4e4 }
+.item_left{width: 210rpx; height: 100%; box-sizing:border-box; text-align: center;padding: 20rpx; background: #f9f9f9 ;border-right:2rpx solid #e4e4e4} .item_left text{ /* margin-left: 44rpx; */}
+.item_right{flex:1; height: 100%; overflow : hidden;white-space:nowrap;text-overflow: ellipsis; padding: 20rpx;}
+.item_right text{ /* margin-left: 66rpx; */}
-.bzfu_img{ width: 164rpx; height:34rpx; margin-right: 18rpx; margin-left: 12rpx }
- .bz_view{ height:100rpx; padding: 0 34rpx 0 13rpx; color: #333; font-size: 28rpx;
+.table_s .tb-l:last-child {border-bottom: none;}
+
+.bzfu_img{ width: 164rpx; height:34rpx; /* margin-right: 18rpx; margin-left: 12rpx */ }
+ .bz_view{ /* height:100rpx; padding: 0 34rpx 0 13rpx; */ color: #333; font-size: 28rpx; padding: 20rpx 20rpx 20rpx 10rpx;
/* border-bottom: 3rpx solid #eee; */
/* border-top: 3rpx solid #eee; */}
- .bz_view view{ width: 460rpx; max-height: 70rpx; overflow: hidden;}
+ .bz_view view{ width: 460rpx; /* max-height: 70rpx; */ /* overflow: hidden; */}
-.bb_view{ display: flex;align-items: center;justify-content: space-between; padding: 0 34rpx; color: #333;
- font-size: 30rpx; height: 104rpx; line-height: 104rpx; overflow: hidden; padding-right:26rpx }
-.red_bb{ color: #d70026; min-width:158rpx;width: auto;}
-.bg_jj{ width: 18rpx; height:18rpx;
+.bb_view{ display: flex;align-items: center;justify-content: space-between; padding: 20rpx; color: #333;
+ font-size: 30rpx; /* height: 104rpx; line-height: 104rpx; overflow: hidden; padding-right:26rpx */ }
+.red_bb{ color: #d70026; /* min-width:158rpx;width: auto; */}
+.bg_jj{ width: 14rpx; height:14rpx;
border-top: 2rpx solid #d70026;
border-right: 2rpx solid #d70026;
transform: rotate(45deg);display:inline-block;
@@ -999,6 +1034,7 @@ left:31rpx;}
.bz-content {
flex-grow: 1;
text-align: justify;
+ padding: 0 30rpx 0 20rpx;
}
/* 顶部边框 */
@@ -1199,20 +1235,23 @@ left:31rpx;}
.xc_comment{
display: flex;
+ justify-content: space-around;
width: 100%;
- height: 42rpx;
- padding-left: 34rpx;
+ box-sizing: border-box;
+ padding: 10rpx 20rpx;
+ /* height: 42rpx;
+ padding-left: 34rpx; */
color: #333;
}
.xc_comment-have-pictures{
width: 153rpx;
- height: 42rpx;
+ /* height: 42rpx; */
line-height: 42rpx;
text-align: center;
background: #ffe3e2;
color: 28rpx;
- border-radius:20rpx;
+ border-radius:21rpx;
font-size: 24rpx;
}
.xc_comment-discuss{
@@ -1229,22 +1268,25 @@ left:31rpx;}
.xc_comment-detail{
display: flex;
- margin-top: 40rpx;
- width: 524rpx;
- margin-left: 34rpx;
- border-radius: 25rpx;
- border: 2rpx solid #d6d4d5;
- overflow: hidden;
+ /* margin-top: 40rpx; */
+ /* width: 524rpx; */
+ /* margin-left: 34rpx; */
+ border-radius: 24rpx;
+ border: 2rpx solid #ebedf0;
+ margin-left: 20rpx;
+ box-sizing: border-box;
+ /* overflow: hidden; */
}
.xc_user-img{
- border-radius:50%;
+ border-radius:50%;
+ margin: auto 0;
}
.xc_comment-user{
display: flex;
- margin-top: 22rpx;
- margin-left: 22rpx;
+ /* margin-top: 22rpx;
+ margin-left: 22rpx; */
}
.xc_user{
width: 170rpx;
@@ -1252,34 +1294,34 @@ left:31rpx;}
margin-left: 6rpx;
overflow: hidden;
}
-.xc_user-name{ height: 25rpx;}
+.xc_user-name{ /* height: 25rpx; */}
.xc_comment-img{
width: 22rpx;
height: 22rpx;
- margin-top: 14rpx;
+ /* margin-top: 14rpx; */
margin-right: 5rpx
}
.xc_comment-font{
- height: 75rpx;
- margin-left: 22rpx;
+ /* height: 75rpx; */
+ /* margin-left: 22rpx; */
white-space:normal;
overflow: hidden;
- margin-top: 8rpx;
- line-height: 38rpx;
+ /* margin-top: 8rpx;
+ line-height: 38rpx; */
}
.xc_comment-val{
- width: 88%;
+ /* width: 88%;
height: 30rpx;
margin-left: 22rpx;
display: flex;
margin-top: 15rpx;
- margin-bottom:15rpx;
+ margin-bottom:15rpx; */
}
.xc_comment-time{
- height: 30rpx;
- font-size: 24rpx;
+ /* height: 30rpx; */
+ font-size: 22rpx;
color: #a5a5a5;
overflow: hidden;
}
@@ -1290,14 +1332,17 @@ left:31rpx;}
.xc_comment-left{
display:inline-block;
width: 312rpx;
+ padding: 20rpx;
}
.xc_goods-img-frame{
- display:inline-block;
- width: 40%;
+ border-radius: 0 22rpx 22rpx 0;
+ overflow: hidden;
+ /* display:inline-block; */
+ /* width: 40%;
height: 90%;
text-align: center;
padding-top: 30rpx;
- vertical-align: top;
+ vertical-align: top; */
}
.xc_imgs{
width: 50rpx;
@@ -1308,11 +1353,13 @@ left:31rpx;}
.pj_word_size{ font-size: 28rpx}
.pj_scroll{
- white-space: nowrap;
+ /* white-space: nowrap; */
/* height: 324rpx; */
- margin-bottom: 50rpx;
+ /* margin-bottom: 50rpx; */
display: flex;
align-items: center;
+ padding: 20rpx 0;
+ /* box-sizing: border-box; */
/* box-shadow: 0 8px 12px #e7e9eb; */
}
@@ -1326,57 +1373,61 @@ left:31rpx;}
}
.cx-frame{
/* border-top:3rpx solid #eee; */
- width:99%;
+ /* width:99%;
height: 95rpx;
line-height: 95rpx;
- padding-left:24rpx;
-
-
+ padding-left:24rpx; */
+ padding: 20rpx;
}
.cx-frame .cx-sizs{
- width: 68rpx;
- height: 100%;
- line-height: 100rpx;
- overflow: hidden;
- margin-left: 10rpx;
+ /* width: 68rpx; */
+ /* height: 100%; */
+ /* line-height: 100rpx; */
+ /* overflow: hidden; */
+ /* margin-left: 10rpx; */
}
.xc-coupon-fram{
position: relative;
- width:200rpx;
- padding-top:30rpx;
+ margin-right: 16rpx;
+ /* width:200rpx; */
+ /* padding-top:30rpx; */
}
.xc-coupon-fram .xc-coupon{
- width:175rpx ;
+ /* width:175rpx ;
height: 40rpx;
- line-height: 40rpx;
+ line-height: 40rpx; */
background-color:#d60021 ;
- margin:0 auto;
+ /* margin:0 auto; */
color:#fff;
-
+ padding: 6rpx 20rpx;
}
.xc-coupon-fram .xc-circular{
- width: 22rpx;
- height:22rpx;
- background-color:#fff;
+ width: 16rpx;
+ height:16rpx;
+ background-color: white;
position:absolute;
- top: 40rpx;
+ top: 50%;
+ /* left: -10rpx; */
+ transform: translateY(-50%);
}
.xc-coupon-fram .xc-one{
- left:3rpx;
+ left: -8rpx;
}
.xc-coupon-fram .xc-two{
- left: 178rpx;
+ right: -8rpx;
}
.cx-obtain-coupon{
- width: 65rpx;
+ /* width: 65rpx;
height: 100%;
- padding-left:15rpx;
+ padding-left:15rpx; */
color: #d70025;
- position: absolute;
- right: 5rpx;
+ display: flex;
+ align-items: center;
+ /* position: absolute;
+ right: 5rpx; */
}
/* 自定义弹出窗口 */
@@ -1391,18 +1442,20 @@ left:31rpx;}
}
.cx-popup .top{
- width: 90%;
- height:85rpx;
- border-bottom: 4rpx solid #d5d5d5;
- padding-top: 50rpx;
- font-weight:600;
+ /* width: 90%;
+ height:85rpx; */
+ font-size: 32rpx;
+ padding: 20rpx 0;
+ border-bottom: 2rpx solid #ebedf0;
+ /* padding-top: 50rpx;
+ font-weight:600; */
}
.cx-popup .top-frame{
- width: 100%;
+ /* width: 100%;
display: flex;
justify-content: center;
- overflow: hidden;
+ overflow: hidden; */
}
.xc-valid-coupon{
width: 90%;
@@ -1413,41 +1466,52 @@ left:31rpx;}
.xc-frame{
position: relative;
}
-.xc-coupon-frame{
- width: 90%;
+.xc-coupon-frame {
+ width: 100%;
max-height: 560rpx;
overflow: auto;
}
-.xc-coupon-frame .coupon{
- width:99%;
+.xc-coupon-frame .rel:not(:first-child) {
+ margin-top: 20rpx;
+}
+.xc-coupon-frame .coupon {
+ width:100%;
height: 168rpx;
border-radius: 25rpx;
- border:3rpx solid #ffdcdc;
+ border:2rpx solid #ffdcdc;
overflow: hidden;
- margin-top:16rpx;
+ /* margin-top:16rpx; */
+ box-sizing: border-box;
}
+/* .xc-coupon-frame .coupon ~ .coupon {
+ margin-top:16rpx;
+} */
.xc-coupon-left{
width: 216rpx;
- height: 100%;
+ /* height: 100%; */
background-color: #ffeeef;
border-right: 4rpx dashed #ffdbd9;
overflow: hidden;
- line-height: 100%;
-
+ /* line-height: 100%; */
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ flex-shrink: 0;
}
.xc-money{
color: #f30026;
text-align:center;
}
.xc-rmb{
- width:44rpx;
- padding-top:7rpx;
+ /* width:44rpx;
+ padding-top:7rpx; */
}
.xc-money-frame{
- margin-left:35rpx;
- margin-top:48rpx;
+ /* margin-left:35rpx;
+ margin-top:48rpx; */
}
.xc-spacing{
@@ -1455,45 +1519,52 @@ left:31rpx;}
}
.xc-circular-one{
position: absolute;
- top:-8rpx;
- left:208rpx;
- width: 27rpx;
+ top:-15rpx;
+ left:205rpx;
+ width: 30rpx;
height: 30rpx;
background: #fff;
overflow: hidden;
}
.xc-circular-two{
position: absolute;
- top:150rpx;
- left:207rpx;
- width: 27rpx;
+ bottom: -15rpx;
+ /* top:150rpx; */
+ left:205rpx;
+ width: 30rpx;
height:30rpx;
background: #fff;
}
.xc-detail-coupon{
- margin-left: 22rpx;
+ /* margin-left: 22rpx;
overflow: hidden;
- padding-top: 43rpx;
-
+ padding-top: 43rpx; */
+ /* display: flex;
+ align-items: center; */
}
.xc-coupon-right{
- width: 455rpx;
- height: 100%;
+ /* width: 455rpx;
+ height: 100%; */
background: #fffaf9;
+ padding: 20rpx;
+ box-sizing: border-box;
+ width: 100%;
+ justify-content: space-between;
+ align-items: center;
}
.xc-below{
- margin-top:22rpx;
+ margin-top:20rpx;
}
.xc-get{
- width: 132rpx;
- height: 48rpx;
+ width: 140rpx;
+ /* height: 48rpx; */
color: #fff;
text-align: center;
- border-radius:20rpx;
- line-height:48rpx;
- margin-left:20rpx;
+ border-radius:27rpx;
+ line-height:54rpx;
+ /* margin-left:20rpx; */
}
.background{
@@ -1511,16 +1582,19 @@ left:31rpx;}
.cx-confirm{
width: 100%;
- height: 160rpx;
+ padding: 20rpx;
+ box-sizing: border-box;
+ /* height: 160rpx; */
}
.cx-confirm .confirm{
- width: 372rpx;
- height: 60rpx;
- background: #f40026;
+ /* width: 372rpx;
+ height: 60rpx; */
+ background-color: #f40026;
color: #fff;
- border-radius:20rpx;
- line-height:60rpx;
+ border-radius:10rpx;
+ line-height: 80rpx;
+ font-size: 28rpx;
}
@@ -1531,17 +1605,21 @@ left:31rpx;}
/* 分享 */
+.icon-share {
+ font-size: 46rpx;
+ color: #d60021;
+}
.xc-share-frame{
- width: 129rpx;
+ /* width: 129rpx;
height: 48rpx;
border-top-left-radius: 18rpx;
- border-bottom-left-radius: 18rpx;
- background: #d60021;
- position:absolute;
+ border-bottom-left-radius: 18rpx; */
+ /* background: #d60021; */
+ /* position:absolute;
left:622rpx;
top:-37rpx;
line-height:50rpx;
- margin-top:52rpx;
+ margin-top:52rpx; */
}
.xc-share-frame-jieti{
width: 129rpx;
@@ -1559,6 +1637,7 @@ left:31rpx;}
}
+
.xc-share-frame .share-frame,.xc-share-frame-jieti .share-frame{
width: 30rpx;
height: 30rpx;
@@ -1779,10 +1858,10 @@ xc-ensure-div{
padding-top: 24rpx;
overflow: hidden;
}
-.xc-frame{
- width: 100%;
- margin-top:20rpx;
-
+.xc-frame {
+ /* width: 100%;
+ margin-top:20rpx; */
+ padding: 20rpx;
}
.xc-frame .list-frame{
@@ -1817,7 +1896,7 @@ xc-ensure-div{
}
.xc-money-frame{
- margin-left:35rpx;
+ /* margin-left:35rpx; */
}
.xc-coupon-effect{
@@ -1952,11 +2031,11 @@ xc-ensure-div{
}
.xc-video{
- width:100rpx;
- height: 50rpx;
- line-height: 50rpx;
+ /* width:100rpx; */
+ /* height: 50rpx;
+ line-height: 50rpx; */
text-align: center;
- margin-left:-30rpx;
+ /* margin-left:-30rpx; */
}
@@ -2030,7 +2109,7 @@ xc-ensure-div{
.wsize{font-size: 32rpx}
-.five-level-word{font-size: 28rpx;}
+.five-level-word{font-size: 24rpx;}
/*-- 推荐商品 --*/
@@ -2103,13 +2182,13 @@ padding-left:24rpx;
.xc-linellae-frame{
width: 100%;
- height: 60rpx;
+ height: 80rpx;
background: #f2f2f2;
}
.xc-linellae-frame .xc-linellae{
width: 386rpx;
height: 1rpx;
- border-bottom: 1rpx solid #a5a5a5;
+ border-bottom: 1rpx solid #ebedf0;
}
.xc-recommend-frame{
background:#f2f2f2;
@@ -2132,7 +2211,8 @@ margin-top: 1rpx;
}
.xc-price-frame{
color: #ec0022;
-height:44rpx;
+ align-items: baseline;
+/* height:44rpx; */
}
.xc-price-frame .sign{
margin-top:19rpx;
@@ -2163,6 +2243,9 @@ padding-left:-4rpx;
.xc-explain{
color:#292929;
width:542rpx;
+ margin: 10rpx 0 20rpx;
+ width: 100%;
+ font-weight: bold;
}
.xc-item{width: 16%; font-size: 26rpx; color: #666;margin-right:5rpx;}
.xc-item .yuan{
@@ -2268,15 +2351,16 @@ margin-top:5rpx;
}
.xc-goods-explain{
width:100%;
- padding-left:30rpx;
+ /* padding-left:30rpx;
margin-left:-9rpx;
- height: 150rpx
+ height: 150rpx */
}
.xc-partner-frame{
border-bottom:2rpx solid #eee;
width:100%;
-padding:0 20rpx;
-height:56rpx;
+padding:20rpx;
+/* height:56rpx; */
+box-sizing: border-box;
}
.xc-person-number{
width:120rpx;
@@ -2298,41 +2382,43 @@ right:17rpx; top:55rpx;
/* border-top:1rpx solid #eee; */
width: 100%;
height: auto;
+ padding: 20rpx;
+ box-sizing: border-box;
}
.on_height{
height: 90rpx;
}
.sn_height{
- min-height: 170rpx; height: auto;padding: 10rpx 0;
+ /* min-height: 170rpx; height: auto;padding: 10rpx 0; */
}
.xc-address_frame .address_frame{
- width: 92%;
-padding-left: 10rpx;
-margin: auto;
+ width: 100%;
+/* padding-left: 10rpx;
+margin: auto; */
}
.shop_name{
}
.stores-img{
-width: 40rpx;
- height: 35rpx;
+ width: 28rpx;
+ height: 28rpx;
margin-right: 10rpx;
}
.shop_name{
margin-right: 10rpx;
}
.address{
- width: 87%;
+ /* width: 100%;
margin-top: 5rpx;
- margin-bottom: 5rpx;
+ margin-bottom: 5rpx; */
}
.distance{
- padding-left: 15rpx;
- padding-right: 15rpx;
+ padding-left: 20rpx;
+ padding-right: 20rpx;
background: #eee;
border-radius: 20rpx;
- margin-right: 5rpx;
+ /* margin-right: 5rpx; */
color: #999;
height: 38rpx;
line-height: 38rpx;
@@ -2518,8 +2604,8 @@ margin-top: 10rpx;
}
.xc-goods-attribute{
border-bottom: 1px solid #eee;
-padding-bottom: 15px;
-margin-bottom:40rpx;
+padding-bottom: 20rpx;
+/* margin-bottom:40rpx; */
}
.xc-val-fream{
width: 105rpx;
@@ -2546,11 +2632,11 @@ border-radius: 55rpx;
.s_btn{ margin-top: 25rpx; }
/* 美妆价的样式 */
.beauty-makeup-frame{
- width: 101.5%;
- margin: auto;
+ /* width: 101.5%;
+ margin: auto; */
height: 120rpx;
border-radius: 15rpx;
- margin-top: 18px;
+ margin-top: 10px;
}
.beauty-makeup-frame .left{
@@ -2558,11 +2644,12 @@ border-radius: 55rpx;
height: 100%;
background:#f7f7f7;
border-radius: 20rpx 0rpx 0rpx 20rpx;
- padding-left: 20rpx;
+ /* padding: 0 10rpx; */
}
.card-frame{
- margin-top: 0rpx; padding-right: 23rpx;
- margin-right: 15rpx;
+ margin-top: 0rpx;
+ /* padding-right: 23rpx;
+ margin-right: 15rpx; */
}
.advert-card{
margin-top: 0rpx!important;
@@ -2576,13 +2663,13 @@ border-radius: 55rpx;
}
.grade-card-frame{
- height:45rpx ;
+ /* height:45rpx ; */
background: #3c300a;
border-radius: 20rpx;
- margin-top: 10px;
- margin-left: 7rpx;
+ /* margin-top: 10px;
+ margin-left: 7rpx; */
justify-content: center;
- padding: 0 15rpx;
+ padding: 4rpx 12rpx;
}
.grade-card-frame .img{
width: 24rpx;
@@ -2596,7 +2683,7 @@ border-radius: 55rpx;
max-width: 165rpx;
}
.card-effect{
- margin-left: 15rpx;
+ /* margin-left: 15rpx; */
}
.at_once_carde{
width:65rpx;
@@ -2620,22 +2707,23 @@ button.custom-service::after{
border: 0;
}
.no_store{color:#d60021; font-size: 26rpx;}
-.cx_show_view{ width: 580rpx; line-height: 30rpx; margin-bottom: 6rpx; }
+.cx_show_view{ width: 580rpx; /* line-height: 30rpx; margin-bottom: 6rpx; */ }
.cx_show_view .word{ width: 400rpx}
.prom_condition {
color: #d60021;
- width: 180rpx;
- height: 30rpx;
+ /* width: 180rpx; */
+ /* height: 30rpx; */
font-size: 20rpx;
- padding-top: 0.01rpx;
- display: flex;
+ /* padding-top: 0.01rpx; */
+ /* display: flex;
justify-content: center;
- align-items: center;
- border: #d60021 solid 1rpx;
+ align-items: center; */
+ border: 2rpx solid #d60021;
border-radius: 10rpx;
margin-right:10rpx ;
- margin-left: 10rpx;
-
+ /* margin-left: 10rpx; */
+ font-size: 24rpx;
+ padding: 0 10rpx;
}
.hui_img{ width: 44rpx; height: 44rpx; margin-right: 8rpx}
.order_hui{color: #444; width: 420rpx}
@@ -2733,4 +2821,25 @@ button.custom-service::after{
.quan_price{
background-color: #ff4700; color: #fff; padding: 10rpx 25rpx; margin-left: 10rpx; border-radius: 30rpx;
}
-.stock{ width: 25%; height: 60rpx; border: 1rpx solid #eee; text-align: center; line-height: 60rpx;}
\ No newline at end of file
+
+/*--闪白屏--*/
+.g_img_box{
+ background-position: center center;
+ background-repeat: no-repeat;
+ -webkit-background-size: cover;
+ -moz-background-size: cover;
+ background-size: cover;
+}
+
+
+
+.arrow {
+ width: auto !important;
+ position: absolute;
+ right: 0;
+ top: 10rpx;
+}
+
+.stock {
+ flex: 1;
+}
\ No newline at end of file
diff --git a/packageA/pages/jfbuy/jfbuy.wxml b/packageA/pages/jfbuy/jfbuy.wxml
index eee8668..e8182f9 100644
--- a/packageA/pages/jfbuy/jfbuy.wxml
+++ b/packageA/pages/jfbuy/jfbuy.wxml
@@ -51,8 +51,8 @@
{{item.integral}}积分 + ￥{{item.addmoney}}
- 零售价：￥{{item.shop_price}}
- 销量：{{item.sales_sum}}
+ 零售价：￥{{item.market_price}}
+ 销量：{{item.buy_num}}
diff --git a/packageA/pages/my_service2/appment_main.js b/packageA/pages/my_service2/appment_main.js
index 73a63b6..413a898 100644
--- a/packageA/pages/my_service2/appment_main.js
+++ b/packageA/pages/my_service2/appment_main.js
@@ -3,6 +3,8 @@ var e = getApp(),
os = a,
t = e.request,
d = e.globalData;
+ var ut = require("../../../utils/util.js");
+
Page({
/**
* 页面的初始数据
@@ -11,21 +13,17 @@ Page({
inurl: a.url, //接口网址
iurl: a.imghost, //服务器网址
store: 0, //是否显示服务门店列表
- beautician: 0, //是否显示美容师列表
- beautician_name: "", //选中的美容师名称
- beauticianID: "", //美容师id
- bea_index: "", //美容师列表下标
+
placeholder: "填写备注", //备注为空的placeholder
store_list: [], //门店列表
- beautician_list: [], //美容师列表
- store_name: "", //选择的服务门店
+
+ store_name: "", //选择的服务门店
fir_pick_index: 0, //选择的门店下标
curpage: 1, //当前分页数
pageSize: 8, //页大小
total: 0,
ismore: 0, //是否加载完毕
- itemId: "", //服务id
- project_id: "", //项目id
+
isScroll: true, //scroll-y是否可以滑动
key_word: "", //是否按门店文字查询
is_service_read: 0, //是否调用过门店接口
@@ -34,8 +32,7 @@ Page({
remarks: "", //备注
storageId: "", //线下门店id
url: "/packageA/pages/my_service/appment_main", //本页面地址路径用于选择时间页面跳转回来
- buyType: "", //项目类型
- time: "", //选择预约时间
+
tment_count: "", //可预约人数
lat: "", //纬度坐标
lon: "", //经度坐标
@@ -44,19 +41,22 @@ Page({
is_sub: 0, //判断是否重复提交
is_textea: 1, //备注是否是可输入
- // 拖拽参数
- writePosition: [], //默认定位参数
- writesize: [0, 0],// X Y 定位
- window: [0, 0], //屏幕尺寸
- write: [0, 0], //定位参数
- scrolltop: 0,//据顶部距离
- v:{},
-
- project: ['项目1', '项目2', '项目3', '项目4', '项目5', '项目6', '项目7'],
- md: [{name:'美导1',time:'08:30-22:00'},{name:'美导2',time:'09:30-18:00'},],
- timeList: [],
- deltaX: 0,
- col_arr:[],
+ write: [0, 0], //定位参数
+ scrolltop: 0,//据顶部距离
+ v:{},
+
+ //project: ['项目1', '项目2', '项目3', '项目4', '项目5', '项目6', '项目7'],
+ //md: [{name:'美导1',time:'08:30-22:00'},{name:'美导2',time:'09:30-18:00'},],
+ timeList: [],
+ deltaX: 0,
+ col_arr:[],
+ wp:[],
+ datet:null,
+ s_top:0,
+
+ cur_sele_i:-1,
+ cur_sele_j:-1
+
},
//控制备注输入
check_text: function() {
@@ -67,6 +67,7 @@ Page({
beautician: 0
})
},
+
onclickstore: function() {
var th = this;
var store = th.data.store;
@@ -85,6 +86,8 @@ Page({
wx.showLoading({
title: '加载中',
})
+
+ //获取门店
th.query_store();
}
}
@@ -96,104 +99,82 @@ Page({
remarks: remarks
})
},
- //提交成功及发送模版代码
+
+
+ //单个预约的提交成功及发送模版代码
success: function() {
+ var user_id=getApp().globalData.userInfo.user_id;
+ wx.showLoading({ title: '加载中', });
var th = this;
var store = th.data.store_name; //门店名称
- var bea_name = th.data.beautician_name; //美容师名称
- var time = th.data.time; //预约时间
- var is_sub = th.data.is_sub; //是否重复提交
- var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/insert"; //接口路径
- var serviceId = th.data.itemId; //服务id
- var beauticianID = th.data.beauticianID; //美容师id
- var buyType = th.data.buyType; //服务项目类型
- var storeId = a.stoid; //商家id
- var storageId = th.data.storageId; //门店id
- var userId = th.data.options.userid; //用户id
- var remarks = th.data.remarks; //用户备注
- var project_id = th.data.project_id; //项目id
- var validay = th.data.validay;
- var json = {
- "arrangeTime": time + ":00",
- "beauticianId": beauticianID,
- "buyType": buyType,
- "effectiveDay": "",
- "number": "",
- "projectId": project_id,
- "remark": remarks,
- "serviceId": serviceId,
- "states": 0,
- "storageId": storageId,
- "storeId": storeId,
- "userId": userId,
- "validay": validay,
- "isxz": 1
-
- }
- var data = JSON.stringify(json);
+ var datet = th.data.datet; //预约时间
+ //接口路径
+ var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/batchinsert";
+ var req_arr={
+ "storageId": th.data.storageId,
+ "storeId": a.stoid,
+ "userId": user_id,
+ "remark": '',
+ "isxz": 1,
+ "states": 0,
+ "list":[]
+ };
+ for(var i in this.data.v){
+ for(var j in this.data.v[i]){
+ var item=this.data.v[i][j];
+ var md=this.data.md[i];
+ var tn=this.data.timeArr[j];
+ var json = {
+ "arrangeTime":datet+' '+ tn + ":00",
+ "beauticianId":encodeURIComponent(md.staffid) ,
+ "buyType": item.BuyType,
+ //"effectiveDay": "",
+ //"number": "",
+ "projectId": item.ProjectID,
+ "serviceId": item.ServiceID,
+ "validay": item.Validay,
+ }
+ req_arr.list.push(json);
+ }
+ }
+ console.log(req_arr);
+ //return false;
+ var js_data = JSON.stringify(req_arr);
wx.request({
url: url,
- data: json,
+ data: js_data,
method: 'post',
header: {
'content-type': 'application/json'
}, // 设置请求的 header
success: function(res) {
- th.setData({
- is_sub: 0
- })
+ th.setData({ is_sub: 0})
wx.hideLoading();
if (res.data.code == 0) {
- getApp().my_warnning("预约成功", 1, th);
- // var store_name = th.data.store_name; //预约门店
- var number = res.data.data.Number;
- // var temp_url = "/api/wx/open/app/user/sendSubscribeMsg"; //模版接口
- //var userinfo = getApp().globalData.userInfo;
- //var name = d.userInfo.nickname;
- // var json = {
- // // "formId": formid,
- // "keyWord": [{
- // "keyword": res.data.data.ServiceName
- // },
- // {
- // "keyword": time.substring(0, 16)
- // }, {
- // "keyword": res.data.data.BeauticianName
- // }, {
- // "keyword": res.data.data.StorageName
- // }, {
- // "keyword": res.data.data.Address
- // }
- // ],
- // "page": "/packageA/pages/my_service/tment_details?number=" + number+"&userid="+th.data.options.userid,
- // "storeId": a.stoid,
- // "typeId": "1011",
- // "userId": th.data.options.userid
- // };
- // var data = JSON.stringify(json);
- // //调用发送预约成功模版接口
- // wx.request({
- // url: th.data.inurl + temp_url,
- // data: data,
- // method: 'post',
- // header: {
- // 'content-type': 'application/json'
- // }, // 设置请求的 header
- // success: function(data) {}
- // })
-
- wx.redirectTo({
- url: "/packageA/pages/my_service/tment_details?number=" + number+"&userid="+th.data.options.userid,
- });
-
+ getApp().my_warnning("预约成功", 1, th);
+
+ if(res.data.data.length>1){
+ var number = res.data.data[0].Number;
+ wx.redirectTo({
+ url: "/packageA/pages/my_service/tment_order_list?number=" + number+"&userid="+user_id,
+ });
+
+ }else{
+ var number = res.data.data[0].Number;
+ wx.redirectTo({
+ url: "/packageA/pages/my_service/tment_details?number=" + number+"&userid="+user_id,
+ });
+ }
+
} else {
getApp().my_warnning(res.data.msg, 0, th);
th.settime();
}
}
})
-
},
+
+
//定时显示texteat
settime: function() {
var th = this;
@@ -203,141 +184,59 @@ Page({
})
}, 2000);
},
- //提交预约
+
+
+ //-- 提交预约 --
sub_success: function(e) {
var th = this;
- var temp_url = th.data.inurl + "/api/wx/weappSendlist/page";
+ //和推送消息有关系
+ var temp_url = th.data.inurl + "/api/wx/weappSendlist/page";
var template_id = "";
- if (th.data.is_sub == 1) {
- return false;
- }
- var store = th.data.store_name; //门店名称
- var bea_name = th.data.beautician_name; //美容师名称
- var time = th.data.time; //预约时间
- var is_sub = th.data.is_sub; //是否重复提交
- th.setData({
- is_textea: 0,
- is_sub: 1
- })
+
+ //门店名称
+ var store = th.data.store_name;
//提交预约前的判断
if (store == "") {
- getApp().my_warnning("请选择服务门店", 0, th);
- th.setData({
- is_sub: 0
- })
- th.settime();
- return false;
- } else if (bea_name == "") {
- getApp().my_warnning("请选择美容师", 0, th);
- th.setData({
- is_sub: 0
- })
- th.settime();
- return false;
- } else if (time == undefined || time == '') {
- getApp().my_warnning("请选择预约时间", 0, th);
- th.setData({
- is_sub: 0
- })
- th.settime();
- return false;
- } else {
- var version ="";
- //判断微信版本是否达到预约成功订阅的要求
- wx.getSystemInfo({
- success(res) {
- version = res.version;
- }
- })
- wx.showLoading({
- title: '加载中',
- })
-
- th.success();
- // if (th.ver(version, '7.0.4') >= 0) {
- // //获取模版id
- // getApp().request.promiseGet(temp_url, {
- // data: {
- // store_id: a.stoid,
- // typeid: "1011"
- // }
- // }).then(res => {
- // if (res.data.code == 0 && res.data.data.pageData.length > 0) {
- // template_id = res.data.data.pageData[0].template_id;
- // // //授权订阅
- // wx.requestSubscribeMessage({
- // tmplIds: [template_id],
- // success(res) {
- // th.success();
- // },
- // fail(res) {
- // th.success();
- // }
- // })
- // } else {
- // th.success();
- // }
- // })
- // } else {
- // // 如果希望用户在最新版本的客户端上体验您的小程序，可以这样子提示
- // wx.showModal({
- // title: '提示',
- // content: '当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。'
- // })
- // th.setData({
- // is_sub: 0
- // })
- // }
-
- }
- },
- //版本判断
- ver:function(v1,v2){
- v1 = v1.split('.')
- v2 = v2.split('.')
- var num1 = "" ;
- var num2 = "";
- var len = Math.max(v1.length, v2.length)
-
- while (v1.length < len) {
- v1.push('0')
- }
- while (v2.length < len) {
- v2.push('0')
- }
-
- for (let i = 0; i < len; i++) {
- num1 = parseInt(v1[i])
- num2 = parseInt(v2[i])
-
- if (num1 > num2) {
- return 1
- } else if (num1 < num2) {
- return -1
- }
- }
- return 0
- },
- goto: function(e) {
- var th = this;
- th.setData({
- beautician: 0,
- is_textea: 0
- })
- if (th.data.store_name == "") {
- getApp().my_warnning("请选择服务门店", 0, th);
- th.settime();
- } else if (th.data.beautician_name == "") {
- getApp().my_warnning("请选择美容师", 0, th);
- th.settime();
- } else {
- th.setData({
- is_textea: 1
- })
- var url = e.currentTarget.dataset.url;
- getApp().goto(url);
- }
+ getApp().my_warnning("请选择服务门店", 0, th);
+ return false;
+ }
+
+ if(Object.keys(th.data.v).length === 0){
+ getApp().my_warnning("请选择美导和预约时间", 0, th);
+ return false;
+ }
+
+ if(th.data.is_sub) return false;
+ th.setData({ is_sub: 1});
+
+
+ //获取模版id
+ getApp().request.get(temp_url, {
+ data: {
+ store_id: a.stoid,
+ typeid: "1011"
+ },
+ success:function(res){
+ if (res.data.code == 0 && res.data.data.pageData.length > 0) {
+ template_id = res.data.data.pageData[0].template_id;
+ // //授权订阅
+ wx.requestSubscribeMessage({
+ tmplIds: [template_id],
+ success(res) {
+ th.success();
+ },
+ fail(res) {
+ th.success();
+ }
+ })
+ } else {
+ th.success();
+ }
+ }
+ })
+
},
+
//点击选择门店
choose_for_store: function(e) {
var th = this;
@@ -355,6 +254,7 @@ Page({
})
}
},
+
//确认选择门店
choice_store: function() {
var th = this;
@@ -367,8 +267,51 @@ Page({
storageId: Id,
is_textea: 1
})
+
+ th.get_project_guide();
+
},
- onReachBottom: function() {
+
+ //获取美导和项目
+ get_project_guide(){
+ var th=this,user=getApp().globalData.userInfo;
+ var req={
+ storeId:os.stoid,
+ userId:user.user_id,
+ StorageId:encodeURIComponent(this.data.storageId),
+ }
+ getApp().request.get("/api/weshop/marketing/reservation/sm/pageNew",{
+ data:req,
+ success:function(res){
+ if(ut.ajax_ok(res)){
+ th.setData({project:res.data.data.pageData})
+ }
+ }
+ })
+
+ req.SeekTime=this.data.datet;
+ getApp().request.get("/api/weshop/marketing/reservation/listStaffAndTime",{
+ data:req,
+ success:function(res){
+ if(ut.ajax_ok2(res)){
+ th.setData({v:{},col_arr:[]})
+ //-- 有些时间是全部没有的 --
+ th.setTimeShow(res.data.data)
+ }else{
+ th.setData({md:[]});
+ }
+ }
+ })
+
+ //获取第一个元素的位置
+ setTimeout(function(){
+ th.queryMultipleNodes();
+ },1000)
+
+ },
+
+
+ onGetBottom: function() {
var th = this;
if (this.data.total <= th.data.pageSize) return;
if (this.data.ismore) return;
@@ -378,6 +321,7 @@ Page({
})
th.query_store();
},
+
//分页查询门店信息
query_store: function() {
var th = this;
@@ -385,14 +329,13 @@ Page({
is_textea: 0
})
var itemId = th.data.itemId; //服务id
- var url = "/api/weshop/marketing/reservation/storage/pagenew";
+ var url = "/api/weshop/marketing/reservation/storage/pageAll";
var key_word = th.data.key_word;
key_word = key_word.replace(/\s+/g, "");
getApp().request.promiseGet(url, {
data: {
- userId: th.data.options.userid,
+ userId: getApp().globalData.user_id,
storeId: a.stoid,
- serviceId: itemId,
latitude: th.data.lat,
longitude: th.data.lon,
page: th.data.curpage,
@@ -534,8 +477,9 @@ Page({
th.setData({
is_textea: 1
})
- console.log('optionsxxx===>', this.data.options);
- // console.log('1-->', "/pages/user/my_service/cosmetology_list?userid=" + th.data.options.userid + 'storageId=' + storageId + '&' + 'itemId=' + itemId + '&' + "projectId=" + project_id);
+
+ console.log('optionsxxx===>', this.data.options);
+ // console.log('1-->', "/pages/user/my_service/cosmetology_list?userid=" + th.data.options.userid + 'storageId=' + storageId + '&' + 'itemId=' + itemId + '&' + "projectId=" + project_id);
wx.navigateTo({
url: "/packageA/pages/my_service/cosmetology_list?userid=" + this.data.options.userid + '&storageId=' + storageId + '&itemId=' + itemId + "&projectId=" + project_id
});
@@ -546,15 +490,30 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
+
+
+ // 如果数值位数为1，则补0
+ function appendZero(obj) {
+ if (obj < 10) {
+ return "0" + "" + obj;
+ } else {
+ return obj;
+ }
+ };
this.getTimeList(23, 30);
var th = this;
+ var now_date = new Date();
+ var md = now_date.getFullYear()+"-"+appendZero(now_date.getMonth() + 1) + "-" + appendZero(now_date.getDate());
+
th.setData({
- options,
+ options,
itemId: options.service_id,
buyType: options.BuyType,
project_id: options.ProjectID,
- validay: options.Validay
+ validay: options.Validay,
+ datet:md,
+ nowDate:md
});
wx.getLocation({
type: 'gcj02',
@@ -584,87 +543,30 @@ Page({
th.data.is_get_local_ok = 1;
}
});
-
- // 获取当前默认导购信息及归属门店信息
- if(options.firstleader) {
- getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+a.stoid+"/"+options.firstleader,{}).then(res=>{
- if(res.data.code==0){
- getApp().globalData.guide_id=res.data.data.id;
-
- getApp().request.promiseGet('/api/weshop/shoppingGuide/geIdStaffInfo', {
- data: {
- store_id: a.stoid,
- guide_id: e.globalData.guide_id,
- UserCode: th.data.options.usercode,
- }
- }).then(res => {
- console.log('res==>', a.stoid, e.globalData.guide_id, th.data.options.usercode);
- if(res.data.data.Tech) {
-
- var data={
- store_name: res.data.data.StorageName,
- beautician_name: res.data.data.StaffName,
- beauticianID: res.data.data.StaffId,
- StorageId: res.data.data.StorageId,
- }
- th.check_firleader(data);
- }
- });
-
-
- };
- });
- };
-
-
+
+ //--先判断会员状态--
+ var user_info = getApp().globalData.userInfo;
+ if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+ wx.navigateTo({
+ url: '/pages/togoin/togoin',
+ })
+ return false;
+ }
},
- //查询剩下可预约人数
- query_more: function() {
- var th = this;
- var url = "/api/weshop/marketing/reservation/can/reservation/countnew";
- var beauticianID = th.data.beauticianID; //美容师id
- var projectID = th.data.itemId; //服务id
- var seekTime = th.data.time; //预约日期
- var storageId = th.data.storageId; //门店id
- var storeId = a.stoid; //商家id
- getApp().request.promiseGet(url, {
- data: {
- beauticianId: beauticianID,
- seekTime: seekTime,
- serviceId: projectID,
- storageId: storageId,
- storeId: storeId
- }
- }).then(res => {
- if (res.data.code == 0) {
- var tment_count = res.data.data.CanReservation;
- th.setData({
- tment_count: tment_count
- })
- } else {
- getApp().my_warnning(res.data.msg, 0, th);
- th.settime();
- }
- })
+
- },
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
var th = this;
- var seekTime = th.data.time; //预约日期
- if (seekTime != "") {
- th.query_more();
- }
th.setData({
- time: th.data.time.substring(0, 16),
is_textea: 1
})
- th.query_project();
-
- th.queryMultipleNodes();
+
},
+
+
//获取单个服务项目信息
query_project: function() {
var th = this;
@@ -687,81 +589,17 @@ Page({
}
})
},
- //关闭导航
- // close: function() {
- // var th = this;
- // var nav_b = th.selectComponent("#nav_b"); //组件的id
- // nav_b.close_box();
- // }
-
- //判断分享的导购是不是有门店，是不是该门店下又该会员
- check_firleader(data){
- var th=this;
- var itemId = this.data.itemId; //服务id
- var url = "/api/weshop/marketing/reservation/storage/pagenew";
- var key_word = data.store_name;
- key_word = key_word.replace(/\s+/g, "");
- getApp().request.promiseGet(url, {
- data: {
- userId: th.data.options.userid,
- storeId: os.stoid,
- serviceId: itemId,
- latitude: th.data.lat,
- longitude: th.data.lon,
- page: 1,
- pageSize: 1000,
- keyWord: key_word
- }
- }).then(res => {
- //-- 如果是门店的话 --
- if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
- var store_data=null;
- for(var i in res.data.data.pageData){
- var it=res.data.data.pageData[i];
- if(it.Id==data.StorageId){
- store_data={
- store_name: data.store_name,
- StorageId: data.StorageId,
- };
- break;
- }
- }
- if(!store_data) return false;
- th.setData(store_data)
-
- }else{
- return false;
- }
-
- //导购接口地址
- var url = "/api/weshop/marketing/reservation/staff/pagenew";
- return getApp().request.promiseGet(url, {
- isShowLoading:1,
- data: {
- storeId: os.stoid,
- userId: th.data.options.userid,
- serviceId: itemId,
- storageId: data.StorageId
- }
- })
- }).then(res=>{
- if (res && res.data && res.data.code == 0) {
- var beautician_list=res.data.data;
- for(var i in beautician_list){
- var item=beautician_list[i];
- if(item.staffid==data.beauticianID){
- th.setData({
- beautician_name:data.beautician_name,
- beauticianID:data.beauticianID,
- })
- break;
- }
- }
-
- }
- })
- },
+
+
+ //开始拖拽项目列表
+ touchmove1: function (e) {
+ var that = this;
+ var position = [e.touches[0].pageX-15, e.touches[0].pageY-that.data.s_top];
+ that.setData({
+ wp: position
+ });
+ },
//开始拖拽
touchmove: function (e) {
@@ -772,59 +610,233 @@ Page({
write: position
});
},
- touchend:function(e){
- var that = this,th=that;
- if(!that.data.copy_btn) return false;
- var position =th.data.write;
- var arr=th.data.col_arr;
- for(var i=0;i1?new Date(d_str+d_arr[1]):0;
-
- for(var j=0; jt2 && t2>0) continue;
- //如果坐标在网格内
- if( position[0]>th.data.f_x+i*th.data.f_width && position[0]th.data.f_y +j*th.data.f_hei && position[1]1){
+ wx.showToast({
+ title: '当前项目预约次数已超出项目剩余数,请先修改', icon: 'none', duration: 2000
+ });
+ return false;
+ }
+ wx.showModal({
+ title: "当前项目已有预约是否修改？",
+ success: function (res) {
+ if(res.confirm){
+ delete th.data.v[i][sj];
+ if(!th.data.v[i])
+ th.data.v[i]={}
+ th.data.v[i][j]=th.data.sele_project;
+ var ind=arr.indexOf(sj);
+ arr.splice(ind, 1);
+ arr.push(j);
+ th.setData({
+ v: th.data.v,col_arr:arr
+ });
+
+ }
+ }
+ })
+ return false;
+ }else{
+ var txt="v["+i+"]["+j+"]";
arr.push(j);
th.setData({
- [txt]: th.data.projectName,
+ [txt]: th.data.sele_project,
col_arr:arr
- });
- break;
- }
+ });
+ return false;
+ }
+ })
+
+ }
+ }
+
+ }
+
+ th.checK_is_can_yy(item,tn,function(res){
+ if(res){
+ if(res>1){
+ wx.showToast({
+ title: '当前项目预约次数已超出项目剩余数,请先修改', icon: 'none', duration: 2000
+ });
+ return false;
+ }
+
+ wx.showModal({
+ title: "当前项目已有预约是否修改？",
+ success: function (res) {
+ if(res.confirm){
+
+ var ii=th.data.cur_sele_i;
+ var jj=th.data.cur_sele_j;
+ delete th.data.v[ii][jj];
+ if(!th.data.v[i])
+ th.data.v[i]={}
+ th.data.v[i][j]=th.data.sele_project;
+ var ind=arr.indexOf(jj);
+ arr.splice(ind, 1);
+ arr.push(j);
+ th.setData({
+ v: th.data.v,col_arr:arr
+ });
+ }
+ }
+ })
+
+ }else{
+ var txt="v["+i+"]["+j+"]";
+ arr.push(j);
+ th.setData({
+ [txt]: th.data.sele_project,
+ col_arr:arr
+ });
+ }
+
- }
- }
- th.setData({copy_btn:0})
+
+ });
},
+
+
+
+ //删除响应的预约
close_this:function (e){
var txt=e.currentTarget.dataset.txt;
var sindex=parseInt(e.currentTarget.dataset.sindex);
- var arr=this.data.col_arr;
- var ind=arr.indexOf(sindex);
+ var arr=this.data.col_arr;
+ var ind=arr.indexOf(sindex);
arr.splice(ind,1)
this.setData({[txt]:null,col_arr:arr})
},
- onPageScroll(e) {
- // console.log('滚动距离', e);
- this.data.scrolltop = e.scrollTop;
- },
+ //计算滚蛋的距离
+ onPageScroll(e) { this.data.scrolltop = e.scrollTop;},
+
+ //确认有没有预约
+ checK_is_can_yy(item, tn, back) {
+ var th = this;
+ var req = {
+ beauticianId: encodeURIComponent(item.staffid),
+ seekTime: this.data.datet + " " + tn + ":00",
+ serviceId: encodeURIComponent(this.data.sele_project.ServiceID),
+ storageId: encodeURIComponent(this.data.storageId),
+ storeId: os.stoid
+ }
+ getApp().request.get("/api/weshop/marketing/reservation/can/reservation/countnew", {
+ data: req,
+ success: function (res) {
+ th.setData({ copy_btn: 0 });
+ if (res.data.code == 0) {
+ if (!res.data.data.CanReservation && parseInt(res.data.data.canReservation) <= 0) {
+ wx.showToast({
+ title: '该项目不可以预约', icon: 'none', duration: 2000
+ });
+ return false;
+ }
+
+ if (!th.data.v) { back(); return false; }
+
+ var arr = Object.keys(th.data.v);
+ if (arr.length == 0) { back(); return false; }
+
+ var num = 0;
+ var sele_arr=[];
+ for (var i in th.data.v) {
+ if (!th.data.v[i]) continue;
+ for (var j in th.data.v[i]) {
+ if (th.data.v[i][j] && th.data.v[i][j].ServiceID == th.data.sele_project.ServiceID) {
+ num++;
+ th.data.cur_sele_i=i;
+ th.data.cur_sele_j=j;
+ }
+ }
+ }
+
+ if (!num) { back(); return false; }
+ //如果已经超出次数的时候，就不能预约了
+ if (num >= parseInt(res.data.data.CanReservation)) {
+
+ back(num);
+ return false;
+ }
+ back();
+
+ } else {
+ wx.showToast({
+ title: res.data.msg,
+ icon: 'none',
+ duration: 2000
+ })
+ }
+ }
+ })
+ },
//声明节点查询的方法
queryMultipleNodes: function() {
@@ -833,16 +845,24 @@ Page({
query.select('.content_view').boundingClientRect() // 这段代码的意思是选择Id=productServe的节点，获取节点位置信息的查询请求
query.selectViewport().scrollOffset() // 这段代码的意思是获取页面滑动位置的查询请求
query.exec(res => {
+ if(!res || res.length==0) return false;
+ if(!res[0]) return false;
+
console.log(res);
th.data.f_x=res[0].left;
th.data.f_y=res[0].top;
th.data.f_hei=res[0].height;
th.data.f_width=res[0].width;
-
})
+
},
+ /*--
getcopy(e) {
+
+ },--*/
+ //项目元素点击后的效果
+ getName(e) {
var that=this;
console.log('e', e);
var x=e.currentTarget.dataset.offsetLeft;
@@ -850,52 +870,74 @@ Page({
var position = [x, y];
that.setData({
write: position,copy_btn:1
- });
-
- },
-
- getName(e) {
- // console.log('e1', e);
- let name = e.currentTarget.dataset.name;
+ });
+ // console.log('e1', e);
+ let index = e.currentTarget.dataset.index;
+ let name = this.data.project[index];
+
+
this.setData({
- projectName: name,
+ sele_project: name,prj_index:index
});
+
+ },
+
+ //-- 项目列表长按 --
+ setmove1(){
+ this.setData({move1:1});
},
-
- // 生成时间段
- getTimeList(hours,step) {
- var minutes=60;
+ //-- 生成时间段 --
+ getTimeList(hours,step) {
+ var minutes=60;
var timeArr = [];
hours = hours;
step = step;
+
+ // 如果数值位数为1，则补0
+ function appendZero(obj) {
+ if (obj < 10) {
+ return "0" + "" + obj;
+ } else {
+ return obj;
+ }
+ };
+
+ var now_date=new Date();
+ var md = now_date.getFullYear()+"-"+appendZero(now_date.getMonth() + 1) + "-" + appendZero(now_date.getDate());
- for(var i = 8; i < hours; i++){
- var str = '';
- if(i < 10) {
- str = 0 + '' + i;
- } else {
- str = '' + i;
- };
-
- for(var j = 0; j < minutes; j++) {
- if(j % step == 0){
- var s = j < 10 ? ':' + 0 + '' + j : ':' + j;
- s = str + s;
- timeArr.push(s);
- };
- };
- };
-
- // console.log('timeArr', timeArr);
- this.setData({
- timeArr,
- });
+ for(var i = 8; i < hours; i++){
+ var str = '';
+ if(i < 10) {
+ str = 0 + '' + i;
+ } else {
+ str = '' + i;
+ };
+
+ for(var j = 0; j < minutes; j++) {
+ if(j % step == 0){
+ var s = ':' + appendZero(j);
+ s = str + s;
+ //-- 不是当天 --
+ if(this.data.datet && this.data.datet!=md){
+ timeArr.push(s);
+ }else{
+ var d1=md+" "+s;
+ var date1=new Date(d1);
+ //必须是大于
+ if(date1.getTime()>now_date.getTime()){
+ timeArr.push(s);
+ }
+ }
+
+ };
+ };
+ };
+
+ this.setData({timeArr,});
},
-
-
-
+
scroll(e) {
// console.log('e', e.detail.deltaX);
let deltaX = e.detail.deltaX;
@@ -904,8 +946,104 @@ Page({
// };
this.data.deltaX = -deltaX;
},
-
+
+ pickerTap:function() {
+ var date = new Date();
+ var monthDay = ['今天','明天'];
+ // 月-日
+ for (var i = 2; i <= 14; i++) {
+ var date1 = new Date(date);
+ date1.setDate(date.getDate() + i);
+ var md = (date1.getFullYear()+"-"+date1.getMonth() + 1) + "-" + date1.getDate();
+ monthDay.push(md);
+ }
+ this.setData(monthDay);
+ },
+
+
+ //-- 选择时间的时候 --
+ bindDateChenge: function(e) {
+ var th=this;
+ var nd=new Date(this.data.nowDate);
+ var nd1=new Date(e.detail.value);
+ if(nd1.getTime() now_date.getTime()) {
+ arr.push(ti_time_arr[j]);
+ }
+ }
+ data[i].listtime = arr;
+ }
+ this.setData({md:data});
+
+
+
+ },
+
+
+
})
\ No newline at end of file
diff --git a/packageA/pages/my_service2/appment_main.js.rej b/packageA/pages/my_service2/appment_main.js.rej
deleted file mode 100644
index efecfee..0000000
--- a/packageA/pages/my_service2/appment_main.js.rej
+++ /dev/null
@@ -1,10 +0,0 @@
-diff a/packageA/pages/my_service/appment_main.js b/packageA/pages/my_service/appment_main.js (rejected hunks)
-@@ -647,7 +647,7 @@
- var project_id = th.data.project_id; //服务项目id
- getApp().request.promiseGet(url, {
- data: {
-- storeId: a.stoid,
-+ storeId: th.data.options.storeid,
- userId: th.data.options.userid,
- projectId: project_id
- }
diff --git a/packageA/pages/my_service2/appment_main.json b/packageA/pages/my_service2/appment_main.json
index d6e82a4..0b45084 100644
--- a/packageA/pages/my_service2/appment_main.json
+++ b/packageA/pages/my_service2/appment_main.json
@@ -3,6 +3,8 @@
"enablePullDownRefresh": false,
"usingComponents": {
"warn": "/components/long_warn/long_warn",
- "nav_b": "/components/nav_b/nav_b"
+ "nav_b": "/components/nav_b/nav_b",
+ "nodata": "/components/nodata/nodata"
+
}
}
\ No newline at end of file
diff --git a/packageA/pages/my_service2/appment_main.wxml b/packageA/pages/my_service2/appment_main.wxml
index 27c9dc0..4fc5fd6 100644
--- a/packageA/pages/my_service2/appment_main.wxml
+++ b/packageA/pages/my_service2/appment_main.wxml
@@ -1,33 +1,43 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
- {{item}}
-
+
+
+
+
+ {{item.ServiceName}}
+
+
+
-
-
+
+
+
+
+
+
+ 日
+ 期
+
+
+
+ {{datet==""?'选择日期':datet}}
+ ∟
+
+
+
+
+
@@ -40,8 +50,11 @@
{{store_name==""?'选择服务门店':store_name}}
∟
-
-
+
+
+
+
+
时间
@@ -56,89 +69,21 @@
-->
- {{item.name}}
+ {{item.StaffName}}
-
- {{v[index][subindex]?v[index][subindex]:''}}
- ×
+
+
+
+ {{v[index][subindex]?v[index][subindex].ServiceName:''}}
+ ×
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -146,9 +91,10 @@
我的预约
-
+
@@ -165,7 +111,7 @@
-
+
@@ -206,8 +152,11 @@
-
+
+
+
\ No newline at end of file
diff --git a/packageA/pages/my_service2/appment_main.wxml.rej b/packageA/pages/my_service2/appment_main.wxml.rej
deleted file mode 100644
index be50729..0000000
--- a/packageA/pages/my_service2/appment_main.wxml.rej
+++ /dev/null
@@ -1,143 +0,0 @@
-diff a/packageA/pages/my_service/appment_main.wxml b/packageA/pages/my_service/appment_main.wxml (rejected hunks)
-@@ -17,54 +17,120 @@
- ∟
-
-
-+
-+
-+
-+
-+ 时间
-+ 8:00
-+ 9:00
-+
-+
-+
-+
-+ 张三
-+ 100
-+ 200
-+
-+
-+ 张三
-+ 100
-+ 200
-+
-+
-+ 张三
-+ 100
-+ 200
-+
-+
-+ 张三
-+ 100
-+ 200
-+
-+
-+ 张三
-+ 100
-+ 200
-+
-+
-+ 张三
-+ 100
-+ 200
-+
-+
-+ 张三
-+ 100
-+ 200
-+
-+
-+ 1张三
-+ 300
-+ 300
-+
-+
-+
-+
-+
-+
-+ 项目1
-+
-+
-+
-+ 项目1
-+
-+
-+
-+
-+
-+
-
--
-+
-
--
-+
-
-
--
--
-+
-+
-
--
-+
-
--
-+
-+
-+
-+
-
-
--
-+
-
--
-+
-
-
--
-+
-+
-
-
--
- 一
+ 一
diff --git a/pages/cart/cart/cart.wxss b/pages/cart/cart/cart.wxss
index 94bdba2..c792aeb 100644
--- a/pages/cart/cart/cart.wxss
+++ b/pages/cart/cart/cart.wxss
@@ -104,7 +104,7 @@ radio {
.count {
display: flex;
bottom: 5rpx;
- border: 2rpx solid rgb(236, 236, 236);
+ /* border: 2rpx solid rgb(236, 236, 236); */
margin-bottom: 3rpx;
}
@@ -129,12 +129,23 @@ radio {
font-size: 32rpx;
}
-.sub {
- border-right: 2rpx solid rgb(236, 236, 236);
+.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;
}
.add {
- border-left: 2rpx solid rgb(236, 236, 236);
+ /* background-color: #f8f8f8; */
+ /* border-left: 1px solid #000; */
}
.pay-for {
@@ -362,3 +373,8 @@ page {
padding: 0;
vertical-align: top;
}
+
+.sub.active {
+ /* background-color: #ddd; */
+ color: #ccc;
+}
diff --git a/pages/cart/cart2/c_filter.wxs b/pages/cart/cart2/c_filter.wxs
index 7216131..e8eda3e 100644
--- a/pages/cart/cart2/c_filter.wxs
+++ b/pages/cart/cart2/c_filter.wxs
@@ -1,5 +1,6 @@
var filters = {
toFix:function(val,count){
+ if(!val) return parseFloat(0).toFixed(count);
return val.toFixed(count)
},
format_time:function(ts,isFull) {
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 5517e31..c30b87a 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -108,14 +108,17 @@ Page({
order_prom_list_cart:null,
ispt_goods:0, //是否平摊至单品，0要平摊 1不平摊
- rank_switch:0, //是不是开同等级卡
- show_card:null, //显示的等级卡
- card_name:'', //显示的卡的名称
- card_cut_price:null,//减价多少钱
-
- show_submit:0, //提交按钮变正常显示
- is_get_offline:1,
+
+ rank_switch:0, //是不是开同等级卡
+ show_card:null, //显示的等级卡
+ card_name:'', //显示的卡的名称
+ card_cut_price:null,//减价多少钱
+
+ show_submit:0, //提交按钮变正常显示
+ is_get_offline:1,
+ tabs: ['门店自提','快递邮寄'],
+ currentTabIndex: 1,
},
onLoad: function(t) {
wx.setNavigationBarTitle({ title: "填写订单",})
@@ -223,8 +226,10 @@ Page({
getApp().getConfig2(function (ee) {
var json_d = JSON.parse(ee.switch_list);
th.data.json_d=json_d;
- th.data.ispt_goods=json_d.ispt_goods; //是不是平摊到单品的控制参数赋值
- th.setData({ is_close_quan: json_d.is_close_quan,sales_rules:ee.sales_rules,rank_switch:json_d.rank_switch});
+ th.data.ispt_goods=json_d.ispt_goods; //是不是平摊到单品的控制参数赋值
+ var is_default_logistics=json_d.is_default_logistics;
+
+ th.setData({ is_close_quan: json_d.is_close_quan,sales_rules:ee.sales_rules,rank_switch:json_d.rank_switch,is_default_logistics:is_default_logistics});
var rank_switch=json_d.rank_switch;
var max_price=-1;
@@ -276,8 +281,15 @@ Page({
//-------------------获取物流---------------
get_wuliu(func) {
var th = this;
- to.getwuliu(function (e) {
- th.setData({ wu_arr: e })
+ to.getwuliu(function (e) {
+ //系统是是否开启了默认的物流
+ if(th.data.is_default_logistics){
+ //如果第一个不是开启默认，说明要让用户自己选
+ if(!e[0].is_default){
+ th.setData({is_default_logistics:0});
+ }
+ }
+ th.setData({ wu_arr: e })
typeof func == "function" && func();
})
},
@@ -489,9 +501,9 @@ Page({
var narr = new Array(); narr.push(item);
- //-----------拼装购物车结算的数组,如果有默认物流时要用默认物流编号-----------------
+ //-----------拼装购物车结算的数组,如果有默认物流时要用默认物流编号,计算默认的物流，不管是不是自提都算一下-----------------
var m_wind=0,def_exp_code=getApp().globalData.userInfo.def_exp_code;
- if(e_t==0 && def_exp_code){
+ if(def_exp_code){
for(var k=0;k order_m) {
- order_m = order_m.toFixed(2);
+ order_m = parseFloat(order_m).toFixed(2);
th.setData({ [txt]: order_m, [txt2]:0,[txt3]:coupon_price,show_submit:1 })
}else{
- order_m =parseFloat(order_m - amoney);
+ order_m =parseFloat(order_m) - parseFloat(amoney);
order_m = order_m.toFixed(2);
th.setData({ [txt]: amoney, [txt2]: order_m,[txt3]:coupon_price,show_submit:1 })
}
@@ -1672,6 +1696,10 @@ Page({
total_m= parseFloat( total_m)+ parseFloat( th.data.formData.shipping_price);
order_m = parseFloat(order_m)+ parseFloat( th.data.formData.shipping_price);
var atxt= "formData.total_amount";
+
+ total_m=total_m.toFixed(2);
+ order_m=order_m.toFixed(2);
+
th.setData({ [atxt]: total_m, })
var txt = "formData.user_money";
@@ -1681,10 +1709,10 @@ Page({
//--------------如果使用余额---------------------
if (th.data.bn_use_money == 1) {
if (amoney> order_m) {
- order_m = order_m.toFixed(2);
+ order_m = parseFloat(order_m).toFixed(2);
th.setData({ [txt]: order_m, [txt2]:0,[txt3]:coupon_price,show_submit:1 })
}else{
- order_m =parseFloat(order_m - amoney);
+ order_m =parseFloat(order_m) - parseFloat(amoney);
order_m = order_m.toFixed(2);
th.setData({ [txt]: amoney, [txt2]: order_m,[txt3]:coupon_price,show_submit:1 })
}
@@ -1868,7 +1896,10 @@ Page({
//积分购，先要带is_integral_normal=1
if(gg.is_integral_normal) goods.is_integral_normal=1;
-
+
+ //先要带is_pd_normal=1
+ if(gg.is_pd_normal) goods.is_pd_normal=1;
+
//如果不立即购买或者秒杀，如果是线下库存购买的时候
if(goods.prom_type!=1 && goods.prom_type!=6 && th.data.sales_rules==2){
var isok=1;
@@ -3423,7 +3454,9 @@ Page({
//是不是线下
var is_get_offline=item.is_offline;
this.setData({pop_offline_index:index,is_offline_show:1,show_off_price:off_price.toFixed(2),is_get_offline:is_get_offline});
- }
+ },
+
+
diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index a525d4c..f3dd606 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -4,18 +4,52 @@
-
+
@@ -198,7 +242,7 @@
-
+
@@ -224,7 +268,7 @@
-
+
￥{{filters.toFix(bn_goods.shop_price,2)}}
x{{bn_goods.buynum}}
@@ -247,7 +291,7 @@
{{filters.show_gui_ge(buy_now_gift_goods.goods_spec,buy_now_gift_goods.goods_color)}}
-
+
￥0
x{{buy_now_gift_goods.buynum}}
@@ -270,7 +314,7 @@
{{filters.show_gui_ge(item.goods_spec,item.goods_color)}}
-
+
￥{{item.price}}
x{{item.goods_num}}
@@ -319,23 +363,14 @@
-
-
-
-
- 门店自提
-
-
-
- 快递邮寄
-
-
-
-
- {{wu_arr[index].name}}
-
+
+
+ 选择物流
+
+ {{wu_arr[index].name}}
+
-
+
@@ -406,7 +441,7 @@
- 应付金额：￥{{formData.order_amount}}
+ 应付金额：￥{{formData.order_amount}}
diff --git a/pages/cart/cart2/cart2.wxss b/pages/cart/cart2/cart2.wxss
index a3ed00c..d8c09c8 100644
--- a/pages/cart/cart2/cart2.wxss
+++ b/pages/cart/cart2/cart2.wxss
@@ -20,6 +20,8 @@
}
+
+
page {
/* background-color: #FAFAFA; */
background-color: #F0F0F0;
@@ -31,6 +33,32 @@ page {
/* padding-top: 28rpx; */
padding-bottom: 120rpx;
}
+
+.tab-container {
+ font-size: 28rpx;
+ margin-top: 20rpx;
+ display: flex;
+}
+
+.tab-wrapper {
+ background-color: #ccc;
+ display: flex;
+ border-radius: 40rpx;
+ overflow: hidden;
+}
+
+.tab {
+ padding: 20rpx 30rpx;
+
+}
+
+
+.tab.active {
+ background-color: white;
+ border-radius: 40rpx;
+}
+
+
.user-mes {
position: relative;
background-color: #fff;
@@ -38,23 +66,25 @@ page {
color: #444;
/* margin-top: 28rpx; */
border-radius: 14rpx;
+ padding: 20rpx 70rpx 20rpx 20rpx;
}
.user-contact {
- padding: 24rpx 26rpx;
- font-weight: 600;
+ /* padding: 24rpx 26rpx;
+ font-weight: 600; */
}
.location {
position: relative;
- padding: 0 70rpx 24rpx;
+ /* padding: 0 70rpx 24rpx; */
}
.pos-icon {
- position: absolute;
- left: 28rpx;
- top: 6rpx;
- width: 30rpx;
- height: 36rpx;
+ /* position: absolute; */
+ /* left: 28rpx;
+ top: 6rpx; */
+ width: 20rpx;
+ height: 24rpx;
+ display: inline-block;
}
.border-img {
@@ -132,12 +162,12 @@ page {
.use-item{
display: flex;
align-items: center;
- height: 80rpx;
+ /* height: 80rpx; */
/* border-bottom: 1px solid #ddd; */
- font-size: 30rpx;
+ font-size: 26rpx;
/* width:95%;
margin:auto; */
- padding: 0 26rpx;
+ padding: 20rpx;
}
.use-item>view{
display: flex;
@@ -148,9 +178,9 @@ margin:auto; */
}
.use-item .dp{
display: block;
- width: 50rpx;
- height: 50rpx;
- margin-left: -6rpx;
+ width: 40rpx;
+ height: 40rpx;
+ /* margin-left: -6rpx; */
}
.set-item {
@@ -182,11 +212,11 @@ margin:auto; */
.coupon-mes {
/* box-sizing: border-box; */
- height:95rpx;
- padding: 0 26rpx;
+ /* height:95rpx; */
+ padding: 20rpx;
background-color: #fff;
font-size: 30rpx;
- color: #444;
+ /* color: #444; */
/* width: 100%; */
border-radius: 14rpx;
margin-top: 20rpx;
@@ -225,9 +255,9 @@ margin:auto; */
.word-box {
font-size: 26rpx;
/* width: 600rpx; */
- padding: 10rpx;
+ /* padding: 10rpx;
height: 28rpx;
- line-height: 40rpx;
+ line-height: 40rpx; */
}
.max-word {
@@ -237,7 +267,7 @@ margin:auto; */
}
.information {
- padding: 0 26rpx;
+ /* padding: 20rpx; */
background-color: #fff;
/* margin-bottom: 120rpx; */
}
@@ -245,10 +275,11 @@ margin:auto; */
.information .item {
display: flex;
justify-content: space-between;
- height: 60rpx;
- line-height: 60rpx;
- font-size: 26rpx;
- color: #777;
+ /* height: 60rpx;
+ line-height: 60rpx; */
+ font-size: 24rpx;
+ /* color: #333; */
+ padding: 20rpx;
}
.btn-wrap {
@@ -364,12 +395,13 @@ margin:auto; */
background-color: white;
}
.xc-right{
- width:20rpx;
- height:20rpx;
+ width:12rpx;
+ height:12rpx;
border-top:2rpx solid #000;
border-right:2rpx solid #000;
transform:rotate(45deg);
display:inline-block;
+ margin-left: 10rpx;
}
.xc-coupon-frame .work-frame .work{ font-size: 30rpx; line-height: 92rpx; }
@@ -904,7 +936,7 @@ margin-left: 20rpx;
.plus_buy{
background-color: #fff;
margin:15rpx 0;
- padding: 20rpx 10rpx;
+ padding: 20rpx;
position: relative;
}
diff --git a/pages/cart/cart2_inte/cart2_inte.js b/pages/cart/cart2_inte/cart2_inte.js
index 50de9a3..6bbe117 100644
--- a/pages/cart/cart2_inte/cart2_inte.js
+++ b/pages/cart/cart2_inte/cart2_inte.js
@@ -93,8 +93,9 @@ Page({
getApp().getConfig2(function (ee) {
var json_d = JSON.parse(ee.switch_list);
th.data.json_d=json_d;
- th.data.ispt_goods=json_d.ispt_goods; //是不是平摊到单品的控制参数赋值
- th.setData({ is_close_quan: json_d.is_close_quan,sales_rules:ee.sales_rules,rank_switch:json_d.rank_switch});
+ th.data.ispt_goods=json_d.ispt_goods; //是不是平摊到单品的控制参数赋值
+ var is_default_logistics=json_d.is_default_logistics;
+ th.setData({ is_close_quan: json_d.is_close_quan,sales_rules:ee.sales_rules,rank_switch:json_d.rank_switch,is_default_logistics:is_default_logistics});
var rank_switch=json_d.rank_switch;
var max_price=-1;
@@ -204,8 +205,14 @@ Page({
get_wuliu(func) {
var th = this;
to.getwuliu(function (e) {
- th.setData({ wu_arr: e })
- typeof func == "function" && func();
+ if(th.data.is_default_logistics){
+ //如果第一个不是开启默认，说明要让用户自己选
+ if(!e[0].is_default){
+ th.setData({is_default_logistics:0});
+ }
+ }
+ th.setData({ wu_arr: e })
+ typeof func == "function" && func();
})
},
//------获取会员信息-----先获取用户信息，在进行下一步---
@@ -294,6 +301,8 @@ Page({
a.get("/api/weshop/goods/get/" + oo.stoid+"/"+e, {
success:async function (t) {
var gd = t.data.data;
+ if(!gd) return false;
+
t.data.data.original_img = oo.imghost + t.data.data.original_img;
t.data.data['buynum'] = gg.goods_num;
var distr_t=0,et=0
@@ -1030,9 +1039,10 @@ Page({
if (rse.data.code==0){
getApp().globalData.userInfo.def_exp_code=is_shipping_code;
th.setData({ open_express: 0 });
- //----计算此时购物车的价格----
- if(th.data.is_b_now==1) th.calculatePrice2();
- else th.calculatePrice();
+ //----计算此时购物车的价格，这个页面没有calculatePrice(),2021.7.19--------
+ //if(th.data.is_b_now==1) th.calculatePrice2();
+ //else th.calculatePrice();
+ th.calculatePrice2();
}
}
})
diff --git a/pages/cart/cart2_inte/cart2_inte.wxml b/pages/cart/cart2_inte/cart2_inte.wxml
index cda87da..243a2df 100644
--- a/pages/cart/cart2_inte/cart2_inte.wxml
+++ b/pages/cart/cart2_inte/cart2_inte.wxml
@@ -4,6 +4,19 @@