diff --git a/app.wxss b/app.wxss
index c67a2f4..435920f 100644
--- a/app.wxss
+++ b/app.wxss
@@ -1211,6 +1211,11 @@ background: #ffe3e2;
content: "\e618";
}
+.icon-weixin:before {
+ content: "\e677";
+}
+
+
/* 去掉零售价划线 */
.no_line_x{
text-decoration: none !important;
diff --git a/components/diy_top_nav/diy_top_nav.js b/components/diy_top_nav/diy_top_nav.js
new file mode 100644
index 0000000..8700664
--- /dev/null
+++ b/components/diy_top_nav/diy_top_nav.js
@@ -0,0 +1,143 @@
+// components/diy_top_nav/diy_top_nav.js
+const app = getApp();
+var os = app.globalData.setting;
+Component({
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+ nav_type:{
+ type:Number,
+ value:0,
+ },
+ istop:{
+ type:Number,
+ value:0,
+ },
+ nav_title:{
+ type:String,
+ value:'首页',
+ },
+ nav_frontColor:{
+ type:String,
+ value:'#ffffff',
+ },
+ nav_backgroundColor:{
+ type:String,
+ value:'#ff7295',
+ },
+ is_share:{
+ type:Boolean,
+ value:true
+ }
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+ imghots: os.imghost,
+ nav_h:0, //导航胶囊上面状态栏的高度
+ mentButt_h:0,//导航胶囊高度
+ navleft_pb:0, //导航左边的自定义内容的左右内边距
+ nav_left_w:281, // 导航左边自定义的内容宽度
+ navleft_w:0, //左边胶囊宽度
+ nav_pb:0, // 导航的下内边距
+ show_menu:false,//详情页导航下拉菜单显示
+ men_list:[
+ {
+ name:'首页',
+ img:'miniapp/js_img/goods_info/home.png?v=3',
+ url:'/pages/index/index/index'
+ },
+ {
+ name:'我的订单',
+ img:'miniapp/js_img/goods_info/order.png?v=3',
+ url:'/pages/user/order_list/order_list'
+ },
+ {
+ name:'我的收藏',
+ img:'miniapp/js_img/goods_info/collect.png?v=3',
+ url:'/packageB/pages/user/collect_list/collect_list'
+ },
+ // {
+ // name:'浏览足迹',
+ // img:'',
+ // url:''
+ // },
+ ]
+ },
+ lifetimes:{
+ attached:function(){
+ //满屏顶部导航参数获取-----------
+ try {
+ let systemInfo = wx.getSystemInfoSync()
+ let mentButt = wx.getMenuButtonBoundingClientRect()
+ let nav_pb = mentButt.top - systemInfo.statusBarHeight
+ let navleft_pb = systemInfo.windowWidth - mentButt.right
+
+ let user_no='';
+ if(getApp().globalData.userInfo){
+ user_no=getApp().globalData.userInfo.erpvipno
+ }
+
+ this.setData({
+ nav_h:mentButt.top,
+ mentButt_h:mentButt.height,
+ nav_left_w:mentButt.left,
+ navleft_pb,
+ nav_pb,
+ navleft_w:mentButt.width*0.9,
+ user_no
+ })
+ } catch (e) {
+ console.error(e);
+ wx.showToast({
+ title: '系统参数获取失败',
+ icon: 'none',
+ duration: 2000
+ })
+ // this.setData({
+ // is_full_screen_navigation:false
+ // })
+ // Do something when catch error
+ }
+ }
+ },
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+ nav_menu(e){
+ let url=e.currentTarget.dataset.url
+ getApp().goto(url)
+ },
+ show_menu_fn(){
+ this.setData({
+ show_menu:!this.data.show_menu
+ })
+ },
+ hide_menu_fn(){
+ this.setData({
+ show_menu:false
+ })
+ },
+ //分享
+ fenx_fn(){
+ this.triggerEvent('clickShare')
+ },
+ call_back(){
+ wx.navigateBack({
+ delta:1,
+ fail:()=>{
+ wx.reLaunch({
+ url: '/pages/index/index/index',
+ })
+ }
+ })
+ },
+ nav_search(){
+ getApp().goto('/pages/goods/search/search')
+ }
+ }
+})
diff --git a/components/diy_top_nav/diy_top_nav.json b/components/diy_top_nav/diy_top_nav.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/components/diy_top_nav/diy_top_nav.json
@@ -0,0 +1,4 @@
+{
+ "component": true,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/components/diy_top_nav/diy_top_nav.wxml b/components/diy_top_nav/diy_top_nav.wxml
new file mode 100644
index 0000000..05d9db0
--- /dev/null
+++ b/components/diy_top_nav/diy_top_nav.wxml
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+ {{nav_title}}
+
+
+
+
+
+
+
+
+ {{nav_title}}
+
+
+
+
+
+
+ {{nav_title}}
+
+
+
+
+
+
+ ID:{{user_no}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索更多商品
+
+
+
+
+
+
+
+
+ 1212121
+
+
diff --git a/components/diy_top_nav/diy_top_nav.wxss b/components/diy_top_nav/diy_top_nav.wxss
new file mode 100644
index 0000000..06adbca
--- /dev/null
+++ b/components/diy_top_nav/diy_top_nav.wxss
@@ -0,0 +1,131 @@
+/* components/diy_top_nav/diy_top_nav.wxss */
+@import '../../app.wxss';
+.nav_left{
+ box-sizing: border-box;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+.nav_left_box{
+ width: 48%;
+ align-items: center;
+ justify-content: center;
+ height: 100%;
+}
+.nav_right{
+ flex: 1;
+}
+.navl_left{
+ height: 100%;
+ background-color:rgba(255, 255, 255, .5);
+ border-radius:30rpx;
+ border: 1rpx solid rgba(227, 227, 227);
+ display: flex;
+ align-items: center;
+ justify-content: space-around;
+ padding: 0 4%;
+ box-sizing: border-box;
+}
+
+.navl_minddle{
+ height: 100%;
+ flex: 1;
+ background-color: bisque;
+ display: flex;
+ align-items: center;
+ vertical-align: middle;
+ /* justify-content: center; */
+ border-radius: 30rpx;
+ background-color: rgb(242, 243, 245);
+ /* background-color: #898989; */
+ font-size: 28rpx;
+ color: #898989;
+}
+.nav_search{
+ display: flex;
+ align-items: center;
+ margin: 0 10rpx 0 20rpx;
+}
+.navl_right{
+ background-color: #fff;
+ border-radius: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border: 1rpx solid rgba(227, 227, 227);
+}
+.navl_left_b{
+ width: 1rpx;
+ height: 65%;
+ background-color:rgb(227,227,227) ;
+}
+.we_chat{
+ width: 45rpx;
+ height: 45rpx;
+}
+.nav_fh {
+ width: 18rpx;
+ height: 18rpx;
+ border-top: 2rpx solid #000;
+ border-right: 2rpx solid #000;
+ transform: rotateZ(-135deg);
+ display: inline-block;
+ margin-bottom: 3rpx;
+}
+.list_menu{
+ position: absolute;
+ /* bottom: -10rpx; */
+ /* top: -13rpx; */
+ left: -35rpx;
+ /* width: 180rpx; */
+ /* width: auto; */
+ padding: 10rpx 26rpx;
+ /* height: 400rpx; */
+ margin-top: 18rpx;
+ background-color: #fff;
+ /* background-color: rebeccapurple; */
+ border-radius: 15rpx;
+ z-index: 9999999;
+}
+.list_menu_top{
+ position: absolute;
+ top: -10rpx;
+ left: 50rpx;
+ width: 26rpx;
+ height: 26rpx;
+ /* background-color: rebeccapurple; */
+ background-color: #fff;
+ transform: rotateZ(45deg);
+ display: inline-block;
+}
+.menu_item{
+ display: flex;
+ align-items: center;
+ font-size: 26rpx;
+ white-space: nowrap;
+ /* padding: 20rpx; */
+}
+.menu_item image{
+ width: 36rpx;
+ height: 36rpx;
+ margin-right: 20rpx;
+}
+.call_back_box{
+ width: 100rpx;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: absolute;
+ /* background-color: blueviolet; */
+ left: 0;
+ bottom: 0;
+}
+.call_back_box .nav_fh{
+ width: 20rpx;
+ height: 20rpx;
+}
+
+.tb_con{
+ position: absolute; bottom: 0; right: 24rpx; font-size: 18rpx;color: #333;
+}
\ No newline at end of file
diff --git a/packageA/pages/chongzhi/chongzhi.js b/packageA/pages/chongzhi/chongzhi.js
index 01173f0..72160e9 100644
--- a/packageA/pages/chongzhi/chongzhi.js
+++ b/packageA/pages/chongzhi/chongzhi.js
@@ -183,16 +183,45 @@ Page({
app.goto('../chongzhiDetails/chongzhiDetails?id=' + id+"&type=1");
},
- viewDetails(e){
+ viewDetails(e){
var index=e.currentTarget.dataset.index;
- var WriteOffCode=this.data.list[index].WriteOffCode;
+ //var WriteOffCode=this.data.list[index].WriteOffCode;
+ var id=this.data.list[index].ID;
+
+ this.detail_next(id);
+ },
+
+ async detail_next(id){
+ var code='';
+ //获取二维码,强制更新
+ let res= await getApp().request.promisePut("/api/weshop/store/updateErpApi",{
+ data:{
+ store_id:getApp().globalData.setting.stoid,
+ ApiName:"/api/erp/vip/buyaddmoneyactDetails/updateMainCode",
+ Id:id,
+ VIPId:getApp().globalData.userInfo.erpvipid
+ }
+ })
+ if(res){
+ if(res.data.code==-1){
+ util.m_toast(res.data.msg);
+ return false;
+ }
+ if(res.data.data)
+ code = res.data.data.WriteOffCode;
+ }
+ if(!code){
+ util.m_toast('未找到二维码');
+ return false;
+ }
+
+
var qrcode = this.selectComponent("#qrcode"); //组件的id
- var code=WriteOffCode;
- var e={is_fw:1,val:code,code:code}
- qrcode.open(e);
-
+ var e={is_fw:1,val:code,code:code}
+ qrcode.open(e);
},
-
+
+
// 检测上拉滚动到底部
// scrollToLower: function (requestData, callback) {
// // 数据总量
diff --git a/packageA/pages/chongzhi/chongzhi.wxml b/packageA/pages/chongzhi/chongzhi.wxml
index 4f8d541..4f4c320 100644
--- a/packageA/pages/chongzhi/chongzhi.wxml
+++ b/packageA/pages/chongzhi/chongzhi.wxml
@@ -28,7 +28,7 @@
{{item.ActName}}
零售价：￥{{item.PosPrice}}
- {{(currentIndex == 0 ? '兑换截止日期': '核销时间') + ':' + item.BeginDate + '至' + (item.EndDate==''?'不限':item.EndDate)}}
+ 购买时间：{{item.BillDate}}
@@ -36,7 +36,7 @@
立即使用
- 已过期
+ 已过期
详情
diff --git a/packageA/pages/chongzhiDetails/chongzhiDetails.js b/packageA/pages/chongzhiDetails/chongzhiDetails.js
index 481ed6a..a0d82f0 100644
--- a/packageA/pages/chongzhiDetails/chongzhiDetails.js
+++ b/packageA/pages/chongzhiDetails/chongzhiDetails.js
@@ -63,7 +63,8 @@ Page({
if(options.type==1){
api="/api/weshop/users/getBuyaddmoneyactDetails";
}
-
+
+ this.data.op_id=options.id;
app.request.get(api, {
data: {
Id:options.id,
@@ -71,8 +72,8 @@ Page({
user_id: UserInfo.user_id,
},
success: function (res) {
+
var result=res.data.data;
-
var now=new Date();
var reg = RegExp("-", "g");
var endtime = result.EndDate.replace(reg, '/');
@@ -136,11 +137,41 @@ Page({
},
- onUse() {
- var qrcode = this.selectComponent("#qrcode"); //组件的id
- var code=this.data.result.WriteOffCode;
- var e={is_fw:1,val:code,code:code}
- qrcode.open(e);
+ async onUse() {
+ //-- 如果过期就不可用 ---
+ if(this.data.result.IsGQ){
+ return false;
+ }
+
+
+ //var code=this.data.result.WriteOffCode;
+ var code='';
+
+ //获取二维码
+ let res= await getApp().request.promisePut("/api/weshop/store/updateErpApi",{
+ data:{
+ store_id:os.stoid,
+ ApiName:"/api/erp/vip/buyaddmoneyactDetails/updateMainCode",
+ Id:this.data.op_id,
+ VIPId:getApp().globalData.userInfo.erpvipid
+ }
+ })
+ if(res){
+ if(res.data.code==-1){
+ util.m_toast(res.data.msg);
+ return false;
+ }
+ if(res.data.data)
+ code = res.data.data.WriteOffCode;
+ }
+ if(!code){
+ util.m_toast('未找到二维码');
+ return false;
+ }
+
+ var qrcode = this.selectComponent("#qrcode"); //组件的id
+ var e={is_fw:1,val:code,code:code}
+ qrcode.open(e);
},
@@ -286,5 +317,53 @@ Page({
if(url){
getApp().goto(url);
}
+ },
+
+ //-- 显示二维码 --
+ getcode(e) {
+ var idx = e.currentTarget.dataset.index;
+ var item = this.data.result.givelist[idx];
+ this.get_code_next(item);
+ },
+
+ async get_code_next(item){
+ var th = this;
+ //--获取成功的时候--
+ var no = '';
+
+ var id=item.GiftsId;
+ var IsRetrieval=item.IsRetrieval;
+
+ //-- 有调起的时候 --
+ if(IsRetrieval){
+ no=item.WriteOffCodeOne;
+ }else {
+ //获取二维码
+ let res = await getApp().request.promisePut("/api/weshop/store/updateErpApi", {
+ data: {
+ store_id: os.stoid,
+ ApiName: "/api/erp/vip/buyaddmoneyactDetails/updateMainCodeOne",
+ Id: id,
+ VIPId: getApp().globalData.userInfo.erpvipid
+ }
+ })
+ if (res) {
+ if (res.data.code == -1) {
+ util.m_toast(res.data.msg);
+ return false;
+ }
+ if (res.data.data)
+ no = res.data.data.WriteOffCode;
+ }
+ }
+ if(!no){
+ util.m_toast('未找到二维码');
+ return false;
+ }
+
+
+ var qc_com = th.selectComponent("#qrcode"); //组件的id
+ var e={is_fw:1,val:no,code:no}
+ qc_com.open(e)
}
})
\ No newline at end of file
diff --git a/packageA/pages/chongzhiDetails/chongzhiDetails.wxml b/packageA/pages/chongzhiDetails/chongzhiDetails.wxml
index 3b92c0e..e38dff6 100644
--- a/packageA/pages/chongzhiDetails/chongzhiDetails.wxml
+++ b/packageA/pages/chongzhiDetails/chongzhiDetails.wxml
@@ -39,13 +39,23 @@
-
+
{{item.CouponSum}}元优惠券
{{item.Integral}}积分
{{item.GradeSum}}成长值
{{item.GiveName}}
- 数量：{{item.Qty}}
+ 数量：{{item.Qty}}
+ {{'兑换截止日期' + ':' + item.BeginDate + '至' + (item.EndDate==''?'不限':item.EndDate) }}
+
+
+
+
+
+
+
@@ -57,7 +67,7 @@
立即充值
- 立即使用
+ 立即使用
已核销
diff --git a/packageA/pages/chongzhiDetails/chongzhiDetails.wxss b/packageA/pages/chongzhiDetails/chongzhiDetails.wxss
index 606542a..779112d 100644
--- a/packageA/pages/chongzhiDetails/chongzhiDetails.wxss
+++ b/packageA/pages/chongzhiDetails/chongzhiDetails.wxss
@@ -109,6 +109,10 @@
font-size: 28rpx;
}
+.btn.bk_huise {
+ background-color: gainsboro;
+}
+
.img-block {
display: block;
width: 100%;
@@ -147,4 +151,20 @@
.container{
display: block;min-height: 100%;width: 100%;position: absolute;left: 0;top: 0;z-index: 1;
+}
+
+.date {
+ padding-top: 10rpx;
+ color: #FE6867;
+}
+
+.box_ware_code.data-v-3a5b7e36 {
+ position: absolute;
+ right: 10rpx;
+ top: 10rpx;
+}
+
+.box_ware_code image.data-v-3a5b7e36 {
+ width: 50rpx;
+ height: 50rpx;
}
\ No newline at end of file
diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index 42c4b4b..bd7f826 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -212,9 +212,15 @@ Page({
hiddenCS: true, //控制客服操作菜单显示和控制
- openSpecModal_flash_normal: 0,
- keyword:'', //门店搜索
- sec_i:-1,//选中分类门店 下标
+ openSpecModal_flash_normal: 0,
+ keyword:'', //门店搜索
+ sec_i:-1,//选中分类门店 下标
+
+ nav_frontColor: "#ffffff",
+ nav_backgroundColor: "#ffffff",
+ nav_type: 2, //导航类型
+ istop: 0, //是否置顶风格为1
+ searchbox_transparent: 1,
},
//------初始化加载----------
diff --git a/packageA/pages/goodsInfo/goodsInfo.json b/packageA/pages/goodsInfo/goodsInfo.json
index 95b96a3..5b20c87 100644
--- a/packageA/pages/goodsInfo/goodsInfo.json
+++ b/packageA/pages/goodsInfo/goodsInfo.json
@@ -6,7 +6,7 @@
"warn": "/components/long_warn/long_warn",
"serviceCard_recommend": "/components/serviceCard_list/serviceCard_list",
"privacy_pop": "/components/privacy_pop/privacy_pop",
- "com_top_nav": "/components/com_top_nav/com_top_nav"
+ "top_nav": "/components/diy_top_nav/diy_top_nav"
},
"navigationStyle": "custom"
}
\ No newline at end of file
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index c732b93..23f13df 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -2,16 +2,20 @@
-
-
-
-
+
+
-
+
+
+
+
+
+
{{item.name}}
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxss b/packageA/pages/goodsInfo/goodsInfo.wxss
index 202a616..2ff8d60 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxss
+++ b/packageA/pages/goodsInfo/goodsInfo.wxss
@@ -2993,6 +2993,14 @@ button.custom-service::after{
padding-left: 30rpx;
}
+
/*按钮变灰色的优化*/
.spec-cart-btn.gray{ background-color:gainsboro !important; }
+.type-navbar_box{
+ position: fixed;
+ top: 0;
+ z-index: 999;
+ width: 100%;
+}
+
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
index 3b04c80..899fbdb 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
@@ -197,6 +197,12 @@ Page({
user_order_pt_state: 0,
is_retail_price: 0,
+
+ nav_frontColor: "#ffffff",
+ nav_backgroundColor: "#ffffff",
+ nav_type: 2, //导航类型
+ istop: 0, //是否置顶风格为1
+ searchbox_transparent: 1,
},
//------初始化加载----------
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json
index bfe3050..d3599be 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json
@@ -7,7 +7,7 @@
"serviceCard_recommend": "/components/serviceCard_list/serviceCard_list",
"share": "/components/share/share",
"privacy_pop": "/components/privacy_pop/privacy_pop",
- "com_top_nav": "/components/com_top_nav/com_top_nav"
+ "top_nav": "/components/diy_top_nav/diy_top_nav"
},
"navigationStyle": "custom"
}
\ No newline at end of file
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
index 3f36a21..0478b0a 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
@@ -3,15 +3,21 @@
-
-
+
+
-
+
+
+
+
+
+
{{item.name}}
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index 19e40d5..55558dc 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -286,12 +286,19 @@ Page({
canBuy: false,
btnHidden: false,
- hiddenCS: true,
+ hiddenCS: true,
is_get_guide:0,
keyword:'', //门店搜索
sec_i:-1,//选中分类门店 下标
goodInfo_ad:"",//商品详情广告
- adding:0 //避免重复点击
+ adding:0, //避免重复点击
+
+ nav_frontColor: "#ffffff",
+ nav_backgroundColor: "#ffffff",
+ nav_type: 2, //导航类型
+ istop: 0, //是否置顶风格为1
+ searchbox_transparent: 1
+
},
//------初始化加载----------
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.json b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.json
index fe3d7a7..8116953 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.json
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.json
@@ -7,7 +7,7 @@
"goods_recommend": "/components/goods_list/goods_list",
"share": "/components/share/share",
"privacy_pop": "/components/privacy_pop/privacy_pop",
- "com_top_nav": "/components/com_top_nav/com_top_nav"
+ "top_nav": "/components/diy_top_nav/diy_top_nav"
},
"navigationStyle": "custom"
}
\ No newline at end of file
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
index 926618c..af99e3e 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -2,19 +2,25 @@
-
-
-
+
+
+
规则
-
-
+
+
+
+
+
+
+
{{item.name}}
@@ -22,7 +28,6 @@
-
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
index 9db035d..0f6356e 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
@@ -3154,3 +3154,11 @@ button.custom-service::after{
/*按钮变灰色的优化*/
.spec-cart-btn.gray{ background-color:gainsboro !important; }
+
+.type-navbar_box{
+ position: fixed;
+ top: 0;
+ z-index: 999;
+ width: 100%;
+}
+
diff --git a/packageC/pages/presell/cardInfo/goodsInfo.js b/packageC/pages/presell/cardInfo/goodsInfo.js
index 4d5401b..5e426ed 100644
--- a/packageC/pages/presell/cardInfo/goodsInfo.js
+++ b/packageC/pages/presell/cardInfo/goodsInfo.js
@@ -216,7 +216,15 @@ Page({
keyword:'', //门店搜索
sec_i:-1,//选中分类门店 下标
- c_curr_p:1
+ c_curr_p:1,
+
+ //-- 顶部导航的优化 --
+ nav_frontColor: "#ffffff",
+ nav_backgroundColor: "#ffffff",
+ nav_type: 2, //导航类型
+ istop: 0, //是否置顶风格为1
+ searchbox_transparent: 1
+
},
//------初始化加载----------
diff --git a/packageC/pages/presell/cardInfo/goodsInfo.json b/packageC/pages/presell/cardInfo/goodsInfo.json
index d18dcca..8b9099b 100644
--- a/packageC/pages/presell/cardInfo/goodsInfo.json
+++ b/packageC/pages/presell/cardInfo/goodsInfo.json
@@ -7,7 +7,7 @@
"goods_recommend": "/components/goods_list/goods_list",
"share": "/components/share/share",
"privacy_pop": "/components/privacy_pop/privacy_pop",
- "com_top_nav": "/components/com_top_nav/com_top_nav"
+ "top_nav": "/components/diy_top_nav/diy_top_nav"
},
"navigationStyle": "custom"
}
\ No newline at end of file
diff --git a/packageC/pages/presell/cardInfo/goodsInfo.wxml b/packageC/pages/presell/cardInfo/goodsInfo.wxml
index cf0d1dc..4067a4e 100644
--- a/packageC/pages/presell/cardInfo/goodsInfo.wxml
+++ b/packageC/pages/presell/cardInfo/goodsInfo.wxml
@@ -2,16 +2,21 @@
-
-
-
+
+
+
-
+
+
+
+
+
{{item.name}}
diff --git a/packageC/pages/presell/cardInfo/goodsInfo.wxss b/packageC/pages/presell/cardInfo/goodsInfo.wxss
index 9ca02aa..bf91d0b 100644
--- a/packageC/pages/presell/cardInfo/goodsInfo.wxss
+++ b/packageC/pages/presell/cardInfo/goodsInfo.wxss
@@ -3063,4 +3063,11 @@ button.custom-service::after{
.c-red {
color: #f23030;
-}
\ No newline at end of file
+}
+
+.type-navbar_box{
+ position: fixed;
+ top: 0;
+ z-index: 999;
+ width: 100%;
+}
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js
index ccf6668..3002697 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.js
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -263,7 +263,14 @@ Page({
sec_i:-1,//选中分类门店 下标
goodInfo_ad:'',//商品详情广告
- c_curr_p:1
+ c_curr_p:1,
+
+ nav_frontColor: "#ffffff",
+ nav_backgroundColor: "#ffffff",
+ nav_type: 2, //导航类型
+ istop: 0, //是否置顶风格为1
+ searchbox_transparent: 1
+
},
//------初始化加载----------
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.json b/packageC/pages/presell/goodsInfo/goodsInfo.json
index d18dcca..8b9099b 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.json
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.json
@@ -7,7 +7,7 @@
"goods_recommend": "/components/goods_list/goods_list",
"share": "/components/share/share",
"privacy_pop": "/components/privacy_pop/privacy_pop",
- "com_top_nav": "/components/com_top_nav/com_top_nav"
+ "top_nav": "/components/diy_top_nav/diy_top_nav"
},
"navigationStyle": "custom"
}
\ No newline at end of file
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxml b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
index d38b242..4197a1d 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.wxml
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
@@ -1,4 +1,4 @@
-
+
@@ -6,11 +6,20 @@
+
+
+
-
+
+
+
+
+
+
{{item.name}}
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxss b/packageC/pages/presell/goodsInfo/goodsInfo.wxss
index 5f00228..cebf5d0 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.wxss
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxss
@@ -3019,3 +3019,10 @@ button.custom-service::after{
.c-red22{
color: #d60021
}
+
+.type-navbar_box{
+ position: fixed;
+ top: 0;
+ z-index: 999;
+ width: 100%;
+}
diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 816958d..f8b1e2e 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -510,14 +510,75 @@ Page({
let goods = item.goods
let keyid = item.sto.keyid
let listform = []
- goods.map(ite => {
- let obj = {
- wareno: ite.goods_sn,
- price: ite.goods_price,
- qty: ite.goods_num
+
+ //-- 如果有订单优惠的时候，就要进行第二次平摊,要用实收来判断满 --
+ if (cartList.order_prom_amount > 0) {
+ let new_arr = [];
+ //--- 预存要以商品的实收为准, ---
+ goods.map(ite => {
+ //-- 不是赠品的时候 --
+ if(!ite.is_gift){
+ let obj = {
+ goods_sn:ite.goods_sn,
+ goods_id: ite.goods_id,
+ goods_price: ite.goods_price, //account是平摊后的实收价格
+ goods_num: ite.goods_num,
+ sumgoods_price: ite.account_fir * ite.goods_num - ite.account_yu_fir-(ite.quan_num?ite.quan_num:0) //-- 优惠后的实收 --
+ }
+ new_arr.push(obj);
+ }
+
+ })
+
+ //-- 如果系统要平摊到单品 --
+ var pt_data = {
+ 'prom_id': 1,
+ 'dis': cartList.order_prom_amount,
+ 'goods': new_arr
}
- listform.push(obj)
- })
+ var pt_res = null;
+ await getApp().request.promisePost("/api/weshop/order/getGoodsSplit", {
+ is_json: 1,
+ data: pt_data
+ }).then(res => {
+ if (res.data.code == 0) {
+ pt_res = res.data.data;
+ }
+ })
+ if (pt_res) {
+ for (let io = 0; io {
+ let obj = {
+ wareno: ite.goods_sn,
+ price: ite.account_yc, //account是平摊后的实收价格
+ qty: ite.goods_num,
+ sumprice: parseFloat(ite.account_yc * ite.goods_num - ite.account_yc_yu).toFixed(2)
+ }
+ listform.push(obj)
+ })
+ }
+ else{
+ goods.map(ite => {
+ //-- 不是赠品的时候 --
+ if(!ite.is_gift) {
+ let obj = {
+ wareno: ite.goods_sn,
+ price: ite.first_account, //account是平摊后的实收价格
+ qty: ite.goods_num,
+ sumprice: parseFloat(ite.account_fir * ite.goods_num - ite.account_yu_fir-(ite.quan_num?ite.quan_num:0)).toFixed(2)
+ }
+ listform.push(obj)
+ }
+ })
+
+ }
+
+
let arr = await this.getGoodsAdvancesum(keyid, listform, cartList)
// }
wx.hideLoading()
diff --git a/packageE/pages/user/labels/labels.js b/packageE/pages/user/labels/labels.js
index f2c92d5..af9a316 100644
--- a/packageE/pages/user/labels/labels.js
+++ b/packageE/pages/user/labels/labels.js
@@ -120,7 +120,7 @@ Page({
}
if(options.is_reg){
- this.data.is_reg=1;
+ this.setData({is_reg:1})
}
th.query_nolabels();
@@ -312,12 +312,12 @@ Page({
},
failStatus: function (t) {
wx.hideLoading();
- th.setData({loading: 0});
+ th.setData({loading: 0,is_check:0});
return app.my_warnning("授权登入失败,请稍后再试!", 0, that);
},
fail: function (t) {
wx.hideLoading();
- th.setData({loading: 0});
+ th.setData({loading: 0,is_check:0});
return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1;
}
});
@@ -416,5 +416,54 @@ Page({
*/
onShow: function() {
+ },
+
+ //会员点击了跳过，就要注册
+ goto_user(e){
+ var th=this;
+ if(this.data.is_check) return false;
+ wx.showLoading({
+ title: "处理中.",
+ mask: true
+ })
+
+ this.setData({ is_check: 1 })
+
+ app.request.get("/api/weshop/users/thirdLogin", {
+ data: getApp().globalData.zc_dd,
+ success: function (e) {
+ wx.hideLoading();
+ if (e.data.code == 0) {
+ app.globalData.user_id = e.data.data.user_id;
+ } else {
+ return app.showWarning("授权登入失败！" + e.data.msg);
+ }
+ getApp().globalData.login_back = 1;
+ wx.setStorageSync("userinfo", e.data.data);
+ wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = s.getFullUrl(app.globalData.userInfo.head_pic);
+
+ //-- 注册的跳转 --
+ getApp().go_to_page(th.data.is_reg,function (){
+ // wx.navigateBack({ delta: 1 })
+ wx.reLaunch({
+ url: '/pages/user/index/index',
+ })
+ })
+
+ },
+ failStatus: function (t) {
+ wx.hideLoading();
+ th.setData({loading: 0,is_check:0});
+ return app.my_warnning("授权登入失败,请稍后再试!", 0, that);
+ },
+ fail: function (t) {
+ wx.hideLoading();
+ th.setData({loading: 0,is_check:0});
+ return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1;
+ }
+ });
+
+
}
+
})
\ No newline at end of file
diff --git a/packageE/pages/user/labels/labels.wxml b/packageE/pages/user/labels/labels.wxml
index 123a319..8513599 100644
--- a/packageE/pages/user/labels/labels.wxml
+++ b/packageE/pages/user/labels/labels.wxml
@@ -4,9 +4,20 @@
兴趣标签
-
- 关闭
-
+
+
+
+
+ 跳过
+
+
+
+
+ 关闭
+
+
+
+
diff --git a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.json b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.json
index 0841c16..dffdf6a 100644
--- a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.json
+++ b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.json
@@ -5,6 +5,8 @@
"my_confirm": "/components/my_confirm/my_confirm",
"qr_code": "/components/qr_code/qr_code",
"nav_b": "/components/nav_b/nav_b",
- "share": "/components/share/share"
- }
+ "share": "/components/share/share",
+ "com_top_nav": "/components/com_top_nav/com_top_nav"
+ },
+ "navigationStyle": "custom"
}
\ No newline at end of file
diff --git a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxml b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxml
index 899a35c..2a63c2f 100644
--- a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxml
+++ b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxml
@@ -1,3 +1,4 @@
+
diff --git a/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.json b/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.json
index 0841c16..dffdf6a 100644
--- a/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.json
+++ b/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.json
@@ -5,6 +5,8 @@
"my_confirm": "/components/my_confirm/my_confirm",
"qr_code": "/components/qr_code/qr_code",
"nav_b": "/components/nav_b/nav_b",
- "share": "/components/share/share"
- }
+ "share": "/components/share/share",
+ "com_top_nav": "/components/com_top_nav/com_top_nav"
+ },
+ "navigationStyle": "custom"
}
\ No newline at end of file
diff --git a/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.wxml b/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.wxml
index cbd3359..a63526c 100644
--- a/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.wxml
+++ b/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.wxml
@@ -1,3 +1,5 @@
+
+
diff --git a/packageE/pages/user/monthgiftbag/monthgiftbag.wxml b/packageE/pages/user/monthgiftbag/monthgiftbag.wxml
index 720fe7c..2fe4634 100644
--- a/packageE/pages/user/monthgiftbag/monthgiftbag.wxml
+++ b/packageE/pages/user/monthgiftbag/monthgiftbag.wxml
@@ -66,6 +66,10 @@
{{item.payIntegral+"积分"}}
+
+
+
+
+
+
{{"购买时间："+item.pay_time}}
diff --git a/pages/giftpack/mygiftpack/mygiftpack.wxml b/pages/giftpack/mygiftpack/mygiftpack.wxml
index c4095d3..5405cf3 100644
--- a/pages/giftpack/mygiftpack/mygiftpack.wxml
+++ b/pages/giftpack/mygiftpack/mygiftpack.wxml
@@ -63,6 +63,9 @@
{{item.payIntegral+"积分"}}
+
+
+
+
{{"零售价：￥"+item.giftPosPrice}}
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index c13eb2a..732ba79 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -278,6 +278,13 @@ Page({
adding:0 , //加入购物车的避免重复
goodInfo_ad:"",//商品详情广告
+
+ nav_frontColor: "#ffffff",
+ nav_backgroundColor: "#ffffff",
+ nav_type: 2, //导航类型
+ istop: 0, //是否置顶风格为1
+ searchbox_transparent: 1,
+
},
//------初始化加载----------
@@ -1328,6 +1335,13 @@ Page({
this.setData({
activeCategoryId: e
}), 1 == e ? this.tabGoodsContent() : 2 == e && this.tabComment();
+
+ if(e>0){
+ wx.pageScrollTo({
+ scrollTop:0
+ })
+ }
+
},
tabClick2: function (t) {
this.setData({
@@ -1371,6 +1385,7 @@ Page({
activeCategoryId: 1
});
+
if (th.data.cat_name == '') {
//过去国别，分类，品牌的名称
i.get("/api/weshop/goodscategory/get/" + o.stoid + "/" + th.data.data.cat_id, {
@@ -9054,4 +9069,31 @@ Page({
},
+ //滚动监听
+ onPageScroll(e) {
+ this.on_menu_list()
+ if (this.data.istop) {
+ let num = e.scrollTop
+ if (num >= 100) {
+ this.setData({
+ searchbox_transparent: 0
+ })
+ }
+ if (num < 100) {
+ this.setData({
+ searchbox_transparent: 1
+ })
+ }
+ }
+ },
+
+
+ //隐藏导航下拉菜单
+ on_menu_list() {
+ let child = this.selectComponent('#my-nav');
+ child.hide_menu_fn()
+ },
+
+
+
})
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/goodsInfo.json b/pages/goods/goodsInfo/goodsInfo.json
index 264c308..358b1bc 100644
--- a/pages/goods/goodsInfo/goodsInfo.json
+++ b/pages/goods/goodsInfo/goodsInfo.json
@@ -8,7 +8,7 @@
"share": "/components/share/share",
"pro_pop": "/components/promate_pop/promate_pop",
"privacy_pop": "/components/privacy_pop/privacy_pop",
- "com_top_nav": "/components/com_top_nav/com_top_nav"
+ "top_nav": "/components/diy_top_nav/diy_top_nav"
},
"navigationStyle": "custom"
}
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index b150c13..274ba8d 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -1,4 +1,5 @@
-
+
+
@@ -15,11 +16,19 @@
规则
-
+
+
+
+
+
+
{{item.name}}
+
+
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index 4177ae3..be8fae9 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -4046,4 +4046,10 @@ button.custom-service::after {
}
/*按钮变灰色的优化*/
-.spec-cart-btn.gray{ background-color:gainsboro !important; }
\ No newline at end of file
+.spec-cart-btn.gray{ background-color:gainsboro !important; }
+.type-navbar_box{
+ position: fixed;
+ top: 0;
+ z-index: 9999;
+ width: 100%;
+}