diff --git a/app.wxss b/app.wxss
index 8193c82..5abb5bb 100644
--- a/app.wxss
+++ b/app.wxss
@@ -446,12 +446,12 @@ background: #ffe3e2;
/* 图标字体(ty) */
@font-face {
font-family: 'iconfont'; /* project id 2054717 */
- src: url('//at.alicdn.com/t/font_2054717_kp0q24eh5l.eot');
- src: url('//at.alicdn.com/t/font_2054717_kp0q24eh5l.eot?#iefix') format('embedded-opentype'),
- url('//at.alicdn.com/t/font_2054717_kp0q24eh5l.woff2') format('woff2'),
- url('//at.alicdn.com/t/font_2054717_kp0q24eh5l.woff') format('woff'),
- url('//at.alicdn.com/t/font_2054717_kp0q24eh5l.ttf') format('truetype'),
- url('//at.alicdn.com/t/font_2054717_kp0q24eh5l.svg#iconfont') format('svg');
+ src: url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.eot');
+ src: url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.eot?#iefix') format('embedded-opentype'),
+ url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.woff2') format('woff2'),
+ url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.woff') format('woff'),
+ url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.ttf') format('truetype'),
+ url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.svg#iconfont') format('svg');
}
.iconfont {
@@ -462,6 +462,10 @@ background: #ffe3e2;
-moz-osx-font-smoothing: grayscale;
}
+.icon-shanchu:before {
+ content: "\e61b";
+}
+
.icon-buqian:before {
content: "\e65f";
}
diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js
index 9e8818a..889a03c 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.js
+++ b/components/diy_goodsGroup/diy_goodsGroup.js
@@ -121,9 +121,13 @@ Component({
methods: {
// 这里是一个自定义方法
- init: function (classstyle_id, wgroup) {
+ init:async function (classstyle_id, wgroup) {
+
+ this.setData({classstyle_id:classstyle_id})
+
var th = this;
var g_id = this.data.g_id;
+ var len=this.data.firist_type_data.length;
if (classstyle_id == 1) {
//---手动选择的时候---
g_id = this.data.firist_type_data[th.data.firist_type_curr];
@@ -147,7 +151,7 @@ Component({
str += g_id[i].goodsid + ",";
}
str=str.substring(0, str.length - 1);
- app.request.get("/api/weshop/goods/getgoodslistOrdby?store_id=" + os.stoid + "&goodsidlist=" + str, {
+ await app.request.get("/api/weshop/goods/getgoodslistOrdby?store_id=" + os.stoid + "&goodsidlist=" + str, {
isShowLoading:false,
success: function(res) {
@@ -179,8 +183,8 @@ Component({
}
//---控制有没有加载更多的按钮---
- if (th.data.firist_type_curr == th.data.firist_type_data.length) {th.setData({ goods_btn: [] }); }
- else th.setData({ goods_btn: res.data});
+ if (th.data.firist_type_curr >= len) {th.setData({ goods_btn: [] }); }
+ else th.setData({ goods_btn: [1,2]});
}
}
@@ -199,7 +203,7 @@ Component({
if(th.data.is_hot) r_data.is_hot=th.data.is_hot;
if(th.data.is_new) r_data.is_new=th.data.is_new;
- app.request.promiseGet("/api/weshop/goods/page", {
+ await app.request.promiseGet("/api/weshop/goods/page", {
data:r_data
}).then(res => {
//商品地址
@@ -216,7 +220,7 @@ Component({
break;
case "3":
var item = {};
- app.request.promiseGet("/api/weshop/goodsGroup/pageGoodsList", {
+ await app.request.promiseGet("/api/weshop/goodsGroup/pageGoodsList", {
data: {
store_id:os.stoid ,
gpid: wgroup,
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml
index 37b1a76..458a9e3 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxml
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxml
@@ -602,14 +602,16 @@
+
+
-
+
-
+
diff --git a/components/diy_picMax/diy_picMax.wxss b/components/diy_picMax/diy_picMax.wxss
index e3d266d..439e126 100644
--- a/components/diy_picMax/diy_picMax.wxss
+++ b/components/diy_picMax/diy_picMax.wxss
@@ -1,11 +1,12 @@
.picMax{
width: 100%;
overflow: hidden;
+ margin-top: -0.01rpx;
}
.pic_item{
- float: left;
+ float: left; margin: 0; padding: 0;
}
-.pic_item image{width: 100%;vertical-align: bottom;}
+.pic_item image{width: 100%;vertical-align: bottom; margin: 0; }
.picMax-clear{clear: both;}
@@ -16,7 +17,10 @@
position:absolute;top:0; left:0;
}
.pic_item2 image{ width: 100%; height: 100%;}
-.width_1{width: 187.5rpx}.width_2{width: 375rpx;}.width_3{width: 562.5rpx}.width_4{width:750rpx;}
+/* .width_1{width: 187.5rpx}.width_2{width: 375rpx;}.width_3{width: 562.5rpx}.width_4{width:750rpx;} */
+.width_1{width: 25%}.width_2{width: 50%}.width_3{width: 75%}.width_4{width:100%}
+
+
.height_1{height: 187.5rpx;}.height_2{height: 375rpx;}.height_3{height: 562.5rpx}.height_4{height: 748rpx;}
.mar_x1{margin-left:187.5rpx;}.mar_x2{margin-left:375rpx;}.mar_x3{margin-left:562.5rpx}.mar_x4{margin-left: 748rpx;}
.mar_y1{margin-top: 187.5rpx;}.mar_y2{margin-top: 375rpx;}.mar_y3{margin-top: 562.5rpx}.mar_y4{margin-top: 748rpx;}
\ No newline at end of file
diff --git a/components/diy_scan/diy_scan.js b/components/diy_scan/diy_scan.js
new file mode 100644
index 0000000..8abf39e
--- /dev/null
+++ b/components/diy_scan/diy_scan.js
@@ -0,0 +1,40 @@
+Component({
+ properties: {
+ object: {
+ type: Object,
+ value: null
+ },
+ // 这里定义了innerText属性，属性值可以在组件使用时指定
+ },
+ data: {
+ // 这里是一些组件内部数据
+ someData: {},
+ left:getApp().globalData.windowWidth-50,
+ top:200,
+ },
+ methods: {
+ // 这里是一个自定义方法
+ customMethod() { },
+ //-- 如果触摸移动 --
+ setTouchMove:function (e) {
+ var w=getApp().globalData.windowWidth;
+ if(e.touches[0].clientX<10 || e.touches[0].clientX>w-50) return false;
+ if(e.touches[0].clientY<10) return false;
+ this.setData({left: e.touches[0].clientX,top: e.touches[0].clientY})
+ },
+
+ //-- 扫描成功之后 --
+ getScancode:function(){
+ var _this = this;
+ //-- 允许从相机和相册扫码 --
+ wx.scanCode({
+ success: (res) => {
+ var result = res.result;
+ wx.navigateTo({
+ url: "/pages/goods/search/search?s_key=" + result,
+ });
+ }
+ })
+ }
+ }
+})
\ No newline at end of file
diff --git a/components/diy_scan/diy_scan.json b/components/diy_scan/diy_scan.json
new file mode 100644
index 0000000..9e7089c
--- /dev/null
+++ b/components/diy_scan/diy_scan.json
@@ -0,0 +1,3 @@
+{
+ "component": true
+ }
\ No newline at end of file
diff --git a/components/diy_scan/diy_scan.wxml b/components/diy_scan/diy_scan.wxml
new file mode 100644
index 0000000..5717414
--- /dev/null
+++ b/components/diy_scan/diy_scan.wxml
@@ -0,0 +1,7 @@
+
+
+
+ {{object.title}}
+
+
+
diff --git a/components/diy_scan/diy_scan.wxss b/components/diy_scan/diy_scan.wxss
new file mode 100644
index 0000000..37b8376
--- /dev/null
+++ b/components/diy_scan/diy_scan.wxss
@@ -0,0 +1,7 @@
+.scan_view{
+ position: fixed;z-index: 100; left: 0; top: 0; width: 100rpx; height: 100rpx;
+ border-radius: 50%; background-color: rgba(125,125,2,0.5);box-shadow: #ccc 0px 0px 70px 1px;
+ display: flex;align-items: center;justify-content: center; color: #f8f8f8;
+}
+.cs-img{ width: 32rpx; height: 32rpx; }
+.s_title{ font-size: 20rpx;}
\ No newline at end of file
diff --git a/components/diy_video/diy_video.js b/components/diy_video/diy_video.js
index 75e7c98..9564a86 100644
--- a/components/diy_video/diy_video.js
+++ b/components/diy_video/diy_video.js
@@ -1,3 +1,7 @@
+var t = getApp(),
+ a = t.request,
+ os = t.globalData.setting;
+
Component({
properties: {
object: {
@@ -11,10 +15,17 @@ Component({
// 这里是一些组件内部数据
someData: {},
videoUrl: "",
+ url:os.imghost
},
- ready: function () {
- this.create_url();
+ ready: function () {
+ //-- 如果是本地视频的时候 --
+ if(this.properties.object.style!=2){
+ //网络地址
+ this.create_url();
+ }else{
+ this.setData({videoUrl:this.properties.object.src});
+ }
},
methods: {
// 这里是一个自定义方法
diff --git a/components/diy_video/diy_video.wxml b/components/diy_video/diy_video.wxml
index f021759..fc763f0 100644
--- a/components/diy_video/diy_video.wxml
+++ b/components/diy_video/diy_video.wxml
@@ -1,3 +1,3 @@
-
+
\ No newline at end of file
diff --git a/packageA/pages/chongzhi/chongzhi.wxml b/packageA/pages/chongzhi/chongzhi.wxml
index bc2e4ed..cf0c47c 100644
--- a/packageA/pages/chongzhi/chongzhi.wxml
+++ b/packageA/pages/chongzhi/chongzhi.wxml
@@ -36,6 +36,7 @@
立即使用
+ 已过期
详情
diff --git a/packageA/pages/liveStreamDetails/liveStreamDetails.js b/packageA/pages/liveStreamDetails/liveStreamDetails.js
index 563ed96..24b87c4 100644
--- a/packageA/pages/liveStreamDetails/liveStreamDetails.js
+++ b/packageA/pages/liveStreamDetails/liveStreamDetails.js
@@ -399,13 +399,18 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
this.getSystemInfo();
var first_leader=options.first_leader;
+ var staffId=options.staffId;
+ var storageId=options.storageId;
+
if(first_leader){
//-- user_id代过来免登陆 --
getApp().globalData.first_leader=first_leader;
//调用接口判断是不是会员
getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+o.stoid+"/"+first_leader,{}).then(res=>{
if(res.data.code==0){
- getApp().globalData.guide_id=res.data.data.id;
+ getApp().globalData.guide_id=res.data.data.id;
+ getApp().globalData.staffId=staffId;
+ getApp().globalData.storageId=storageId;
}
})
}
@@ -420,6 +425,22 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
that.setData({
details: obj
})
+
+ //-- 如果是导购的时候 --
+ if(getApp().globalData.guide_id && getApp().globalData.user_id){
+ //报错领取记录
+ var record={};
+ record.storeId=os.stoid;
+ record.ReceiveTime=ut.formatTime();
+ record.ReceiveType=7;
+ record.ReceiveUserId=getApp().globalData.user_id;
+ record.ShareStaffId=getApp().globalData.staffId;
+ record.ShareStorageId=getApp().globalData.storageId;
+ record.shareActId=details.id;
+ record.shareActName=details.name;
+ getApp().request.promiseGet.post('api/weshop/MdReceiveType/saveReceive',{data:record}).then(res=>{})
+ }
+
// 请求主图
diff --git a/packageA/pages/quan_list/quan_list.wxml b/packageA/pages/quan_list/quan_list.wxml
index b843c58..73ad493 100644
--- a/packageA/pages/quan_list/quan_list.wxml
+++ b/packageA/pages/quan_list/quan_list.wxml
@@ -17,7 +17,9 @@
{{item.name}}
- 所有门店通用
+
+ {{item.coupon_remark}}
+ 所有门店通用
有效期
{{filters.format_time(getcurday+3600*24*item.startdays)}}
{{filters.format_time(item.use_start_time)}}至
diff --git a/packageA/pages/quan_pro/quan_pro.wxml b/packageA/pages/quan_pro/quan_pro.wxml
index 219c326..1a84485 100644
--- a/packageA/pages/quan_pro/quan_pro.wxml
+++ b/packageA/pages/quan_pro/quan_pro.wxml
@@ -8,15 +8,20 @@
-
+
{{q_data.name}}
-
- 全场通用
- 仅限{{q_data.useobjectname}}使用
+
+
+
+ 全场通用
+ 仅限{{q_data.useobjectname}}使用
+
+
+ {{q_data.coupon_remark}}
￥{{filters.toFix(q_data.money,2)}}
diff --git a/pages/activity/pind_list/pind_list.js b/pages/activity/pind_list/pind_list.js
index ea1bb48..29f9906 100644
--- a/pages/activity/pind_list/pind_list.js
+++ b/pages/activity/pind_list/pind_list.js
@@ -14,12 +14,14 @@ Page({
timer:null,
ismore:1,
isshow:0,
- iurl: os.imghost,
+ iurl: os.imghost,
+ ad_data:null,
},
//------初始化加载----------
onLoad: function(t) {
var first_leader = t.first_leader;
+ var th=this;
console.log("------------");
console.log(first_leader);
@@ -33,6 +35,22 @@ Page({
}
})
}
+
+ getApp().request.promiseGet("/api/weshop/ad/page?pid=801&store_id=" + os.stoid, {
+ data: {
+ enabled: 1
+ }
+ }).then(res => {
+ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
+ var a = res.data.data.pageData;
+ var tt = {
+ 'ad_code': os.imghost + a[0].ad_code,
+ 'media_link': '',
+ 'ad_weapplink':a[0].ad_weapplink
+ };
+ th.setData({ad_data:tt});
+ }
+ })
},
onShow: function(t) {
diff --git a/pages/activity/pind_list/pind_list.wxml b/pages/activity/pind_list/pind_list.wxml
index 12741c4..b7b8789 100644
--- a/pages/activity/pind_list/pind_list.wxml
+++ b/pages/activity/pind_list/pind_list.wxml
@@ -2,8 +2,13 @@
-
-
+
+
+
+
+
+
+
diff --git a/pages/activity/seckill_list/seckill_list.js b/pages/activity/seckill_list/seckill_list.js
index aa6e5e0..d107313 100644
--- a/pages/activity/seckill_list/seckill_list.js
+++ b/pages/activity/seckill_list/seckill_list.js
@@ -11,11 +11,13 @@ Page({
timer:null,
ismore:1, //是否可以加载更多
isshow:0,
+ ad_data:null,
},
//------初始化加载----------
onLoad: function(t) {
var first_leader = t.first_leader;
+ var th=this;
console.log("------------");
console.log(first_leader);
@@ -29,6 +31,23 @@ Page({
}
})
}
+
+ getApp().request.promiseGet("/api/weshop/ad/page?pid=701&store_id=" + os.stoid, {
+ data: {
+ enabled: 1
+ }
+ }).then(res => {
+ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
+ var a = res.data.data.pageData;
+ var tt = {
+ 'ad_code': os.imghost + a[0].ad_code,
+ 'media_link': '',
+ 'ad_weapplink':a[0].ad_weapplink
+ };
+ th.setData({ad_data:tt});
+ }
+ })
+
},
@@ -177,6 +196,12 @@ Page({
_errObj[_errImg] = "/public/images/default_goods_image_240.gif";
this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
}
- }
+ },
+
+ onShareTimeline() {
+ return {
+ title: '秒杀活动-' + getApp().globalData.config.store_name,
+ }
+ },
});
diff --git a/pages/activity/seckill_list/seckill_list.wxml b/pages/activity/seckill_list/seckill_list.wxml
index 8de10eb..457b437 100644
--- a/pages/activity/seckill_list/seckill_list.wxml
+++ b/pages/activity/seckill_list/seckill_list.wxml
@@ -2,8 +2,12 @@
-
-
+
+
+
+
+
+
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index e86a4aa..7043117 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -946,7 +946,7 @@ Page({
await getApp().request.promiseGet("/api/weshop/areaFeemail/getAreaGoods",{
data:{store_id:os.stoid,id:no_ex_id}
}).then(res=>{
- if(res.data.code==0){
+ if(res.data.code==0 && res.data.data && res.data.data.length>0){
by_qc=res.data.data[0];
}
})
@@ -1442,7 +1442,7 @@ Page({
await getApp().request.promiseGet("/api/weshop/areaFeemail/getAreaGoods",{
data:{store_id:os.stoid,id:no_ex_id}
}).then(res=>{
- if(res.data.code==0){
+ if(res.data.code==0 && res.data.data && res.data.data.length>0){
no_by_data=res.data.data[0];
//如果有设置不包邮区域的时候
if(res.data.data[0].region_list){
diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js
index 7cfb105..ef114b1 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.js
+++ b/pages/giftpack/buygiftpack/giftpackbuy.js
@@ -25,6 +25,7 @@ Page({
curpage: 1, //当前分页数
pageSize: 10, //页大小
total: 0, //总数量
+ ad_data:null,
},
onLoad: function(options) {
@@ -35,6 +36,25 @@ Page({
getStorageID: a.stoid,
getUserID: d.user_id
})
+
+
+ getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, {
+ data: {
+ enabled: 1
+ }
+ }).then(res => {
+ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
+ var a = res.data.data.pageData;
+ var tt = {
+ 'ad_code': os.imghost + a[0].ad_code,
+ 'media_link': '',
+ 'ad_weapplink':a[0].ad_weapplink,
+ 'bgcolor':a[0].bgcolor,
+ };
+ th.setData({ad_data:tt});
+ }
+ })
+
},
onShow: function() {
@@ -73,6 +93,13 @@ Page({
"userId": that.getUserID, //用户ID
"buyFrom": 2
};
+
+ //-- 分享导购要记录 --
+ if(getApp().globalData.guide_id){
+ json.guide_id=getApp().globalData.guide_id;
+ }
+
+
var data = JSON.stringify(json);
var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
getApp().request.json_post(url, json,
@@ -134,6 +161,13 @@ Page({
"userId": that.getUserID, //用户ID
"buyFrom": 2
};
+
+ //-- 分享导购要记录 --
+ if(getApp().globalData.guide_id){
+ json.guide_id=getApp().globalData.guide_id;
+ }
+
+
var data = JSON.stringify(json);
var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
getApp().request.json_post(url, json,
diff --git a/pages/giftpack/buygiftpack/giftpackbuy.wxml b/pages/giftpack/buygiftpack/giftpackbuy.wxml
index 0669a52..ed1d5c4 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.wxml
+++ b/pages/giftpack/buygiftpack/giftpackbuy.wxml
@@ -1,7 +1,16 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
礼包列表
diff --git a/pages/giftpack/buygiftpack/giftpackbuy.wxss b/pages/giftpack/buygiftpack/giftpackbuy.wxss
index 45f3688..4125b40 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.wxss
+++ b/pages/giftpack/buygiftpack/giftpackbuy.wxss
@@ -6,7 +6,7 @@
*/
page {
- background-color: #fb7454;
+ /* background-color: #fb7454; */
}
.top_img {
diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js
index 5d1f2c8..b641929 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.js
+++ b/pages/giftpack/giftpacklist/giftpacklist.js
@@ -141,10 +141,8 @@ Page({
}
-
)
-
},
GetBuyIntegral: function(e) {
var that = this.data;
@@ -175,6 +173,13 @@ Page({
"userId": d.user_id, //用户ID
"buyFrom":2
};
+
+ //-- 分享导购要记录 --
+ if(getApp().globalData.guide_id){
+ json.guide_id=getApp().globalData.guide_id;
+ }
+
+
var data = JSON.stringify(json);
var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
getApp().request.json_post(url, json,
diff --git a/pages/giftpack/mygiftpack/mygiftpack.js b/pages/giftpack/mygiftpack/mygiftpack.js
index 4cc3f63..2bd7c82 100644
--- a/pages/giftpack/mygiftpack/mygiftpack.js
+++ b/pages/giftpack/mygiftpack/mygiftpack.js
@@ -25,6 +25,7 @@ Page({
curpage: 1, //当前分页数
pageSize: 10, //页大小
total: 0, //总数量
+ ad_data:null,
},
onLoad: function(options) {
@@ -36,6 +37,23 @@ Page({
loadingType: 0,
getDate: i.formatTime(new Date().getTime())
})
+
+ getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, {
+ data: {
+ enabled: 1
+ }
+ }).then(res => {
+ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
+ var a = res.data.data.pageData;
+ var tt = {
+ 'ad_code': os.imghost + a[0].ad_code,
+ 'media_link': '',
+ 'ad_weapplink':a[0].ad_weapplink,
+ 'bgcolor':a[0].bgcolor,
+ };
+ th.setData({ad_data:tt});
+ }
+ })
},
onShow: function() {
diff --git a/pages/giftpack/mygiftpack/mygiftpack.wxml b/pages/giftpack/mygiftpack/mygiftpack.wxml
index ff1c746..1fdc67e 100644
--- a/pages/giftpack/mygiftpack/mygiftpack.wxml
+++ b/pages/giftpack/mygiftpack/mygiftpack.wxml
@@ -1,8 +1,17 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
礼包列表
diff --git a/pages/giftpack/mygiftpack/mygiftpack.wxss b/pages/giftpack/mygiftpack/mygiftpack.wxss
index 3cd1647..6418ac2 100644
--- a/pages/giftpack/mygiftpack/mygiftpack.wxss
+++ b/pages/giftpack/mygiftpack/mygiftpack.wxss
@@ -235,7 +235,7 @@
}
page {
- background-color: rgb(250, 120, 88);
+ /* background-color: rgb(250, 120, 88); */
}
.After_all {
height: 80rpx;
diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js
index e337e35..b593a25 100644
--- a/pages/goods/categoryList/categoryList.js
+++ b/pages/goods/categoryList/categoryList.js
@@ -819,7 +819,7 @@ Page({
// },
// 左侧更新
scrollLower: function (data) {
- //console.log("上拉加载更多", JSON.stringify(data))
+ if(this.data.is_no_more) return false;
var that = this;
clearInterval(that.data.timer);
that.setData({
@@ -843,18 +843,17 @@ Page({
});
if (e.data.data.pageData.length > 0) {
s.setData({
- msgStatus: false,
+ msgStatus: false,is_no_more:0
});
//如果有数据 判断分页为第一页的时候直接渲染数据
if (page > 1) {
//如果分页不是在第一页 那么就把返回的数据追加到原有数据后面
var arr = s.data.requestData
- console.log("arr:=" + JSON.stringify(arr))
-
+
for (var i = 0; i < e.data.data.pageData.length;i++){
arr.push(e.data.data.pageData[i]);
}
- console.log(arr)
+
s.setData({
requestData: arr
});
@@ -875,19 +874,28 @@ Page({
if (page != 1) {
var dataArray = s.data.one_level_classify
var index = s.data.index
- dataArray[index]['items']['is_show_class'] = false
- dataArray[index+1]['items']['is_show_class'] = true
- console.log(dataArray[index + 1]['items'])
- s.setData({
- msgStatus: true,
- stylePage: 1,
- index: index + 1,
- select_classify_on: index + 1,
- cat_id: dataArray[index + 1]['items']['id'],
- classify_name: dataArray[index + 1]['items']['name'],
- one_level_classify: dataArray
- });
- s.style(s.data.stylePage, dataArray[index + 1]['items']['id'])
+ dataArray[index]['items']['is_show_class'] = false
+ //没有下一个类别的时候
+ if(index+1>=dataArray.length){
+ s.setData({is_no_more:1});
+ }else{
+ dataArray[index+1]['items']['is_show_class'] = true
+ console.log(dataArray[index + 1]['items'])
+ s.setData({
+ msgStatus: true,
+ stylePage: 1,
+ index: index + 1,
+ select_classify_on: index + 1,
+ cat_id: dataArray[index + 1]['items']['id'],
+ classify_name: dataArray[index + 1]['items']['name'],
+ one_level_classify: dataArray,
+ is_no_more:0
+ });
+ s.style(s.data.stylePage, dataArray[index + 1]['items']['id'])
+ }
+
+
+
}else{
//没有数据而且是第一页的时候
s.setData({
@@ -897,7 +905,8 @@ Page({
s.setData({
msgStatus: true,
countDownNum: countDownNum,
- requestData: []
+ requestData: [],
+ is_no_more:0,
});
s.data.timer=setInterval(function () {
if (countDownNum == 0) {
@@ -1012,6 +1021,12 @@ Page({
if(!url || url=='') return;
if(url[0]!='/') url='/'+url;
getApp().goto(url);
+ },
+
+ onShareTimeline(){
+ return {
+ title:'商品分类-'+getApp().globalData.config.store_name,
+ }
}
});
\ No newline at end of file
diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index d325ce6..0c29be4 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -493,6 +493,9 @@
+
+ 暂无更多
@@ -500,8 +503,9 @@
该类别暂无推荐商品 {{countDownNum}} 秒后自动跳到下一个类别
该类别暂无推荐商品
-
+
+
diff --git a/pages/goods/goodsInfo/buy_integral.wxml b/pages/goods/goodsInfo/buy_integral.wxml
index 251c1d7..a49250f 100644
--- a/pages/goods/goodsInfo/buy_integral.wxml
+++ b/pages/goods/goodsInfo/buy_integral.wxml
@@ -11,6 +11,7 @@
{{prom_integral}}积分
+
{{prom_price}}元
+ 0积分
diff --git a/pages/goods/goodsInfo/g_filter.wxs b/pages/goods/goodsInfo/g_filter.wxs
index c39bff3..e9033b0 100644
--- a/pages/goods/goodsInfo/g_filter.wxs
+++ b/pages/goods/goodsInfo/g_filter.wxs
@@ -80,8 +80,38 @@ var g_filters = {
if(min_name.length>4) min_name=min_name.substring(0, 8);
return min_name;
},
+
+ toFix: function (val, count,set) {
+ if(val===undefined) return 0;
+ if(val===null) return 0;
+ if(val==='') return 0;
+ val = parseFloat(val);
+ if(set==1 && val==0) return val;
+ return val.toFixed(count)
+ },
+
+ //折扣数值处理，小数位数为1时，只显示1位；小数位数为2时，才显示2位；
+ num: function(value) {
+ if(value != 0) {
+ var val = value.toFixed(2).toString();
+ if(val.indexOf('.') != -1) {
+ var arrval = val.split('.');
+ if(arrval[1].length == 1 && arrval[1][0] == 0) {
+ val = val.slice(0,-2);
+ };
+
+ if(arrval[1].length == 2 && arrval[1][1] == 0) {
+ val = val.slice(0,-1);
+ };
+ };
+ return val;
+ } else {
+ return value.toFixed(0);
+ };
+ },
}
module.exports = {
is_has_rank:g_filters.is_has_rank,
- get_card_price:g_filters.get_card_price,
+ get_card_price:g_filters.get_card_price,
+ num:g_filters.num,
}
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 32c492a..b5a6041 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -261,10 +261,10 @@ Page({
room_user_share=t.room_user_share; //如果是会员分享带有room_id的话，那么接下来会员分享就不传room_id
//-- 自定义海报 --
- getApp().request.promiseGet("/api/weshop/goods/poster/page",{
- data:{store_id:os.stoid, type:1, is_use:1 }
+ getApp().request.promiseGet("/api/weshop/goods/poster/page", {
+ data:{store_id:os.stoid, type:1, is_use:1}
}).then(res=>{
- if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){
+ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0]){
var poster_data=res.data.data.pageData[0];
var json_str=poster_data.jsonStr;
@@ -314,7 +314,6 @@ Page({
getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{
if(res.data.code==0){
getApp().globalData.guide_id=res.data.data.id;
- console.log("log2---".getApp().globalData.guide_id);
}
})
}
@@ -700,7 +699,25 @@ Page({
ee.check_is_youhui(ee.data.gid);
t.data.data.on_time = ut.formatTime(t.data.data.on_time, 'yyyy-MM-dd hh:mm:ss');
- var txt = (t.data.data.shop_price / t.data.data.market_price * 10).toFixed(2);
+ var txt = (t.data.data.shop_price / t.data.data.market_price * 10).toFixed(2).toString();
+
+
+ if(txt != 0) {
+ if(txt.indexOf('.') != -1) {
+ var arrtxt = txt.split('.');
+ if(arrtxt[1].length == 1 && arrtxt[1][0] == 0) {
+ txt = txt.slice(0,-2);
+ };
+
+ if(arrtxt[1].length == 2 && arrtxt[1][1] == 0) {
+ txt = txt.slice(0,-1);
+ };
+ };
+ } else {
+ txt = 0;
+ }
+
+
t.data.data['disc'] = txt;
if (t.data.data.original_img.indexOf(o.imghost) == -1)
@@ -3587,6 +3604,12 @@ Page({
'store_id': os.stoid,
'type': 5
};
+
+ //-- 导购ID --
+ if(getApp().globalData.guide_id){
+ pdata.guide_id=getApp().globalData.guide_id;
+ }
+
var app = getApp(),
th = this;
app.request.post("/api/weshop/couponList/saveCouponList", {
@@ -3641,14 +3664,14 @@ Page({
var unit = that.data.screenWidth / 750 * 1.35; //基础单位，
var path2 = that.data.data.original_img;
var scene = th.data.gid+"";
- var user_id=getApp().globalData.user_id?getApp().globalData.user_id:0;
- if(user_id>0){
+ var user_id = getApp().globalData.user_id?getApp().globalData.user_id:0;
+ if(user_id>0) {
scene+="_"+user_id;
}
//-- 如果不是会员分享过来的要分享给别人 --
- if(getApp().globalData.room_id && th.data.data.goods_id==getApp().globalData.room_goods_id && !getApp().globalData.room_user_share){
+ if(getApp().globalData.room_id && th.data.data.goods_id==getApp().globalData.room_goods_id && !getApp().globalData.room_user_share) {
//固定房间是第3个字符
- if(!user_id) scene+="_0";
+ if(!user_id) scene+="_0";
scene+="_"+getApp().globalData.room_id ;
}
///二微码
@@ -3678,7 +3701,7 @@ Page({
context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit);
//-- 是自定义海报的情况下 --
- if(th.data.poster && parseInt(th.data.poster.style)==2){
+ if(th.data.poster && parseInt(th.data.poster.style)==2) {
//在线上分享人的情况下
if(parseInt(th.data.poster.show_headpic)){
//获取坐标
@@ -3697,9 +3720,13 @@ Page({
context.setFontSize(16 * unit)
context.setLineJoin('round'); //交点设置成圆角
context.setFillStyle("white")
- context.fillText('强烈推荐', x1 + width+8*unit, y1-1*unit);
+ context.fillText('强烈推荐', x1 + width+8*unit, y1-1*unit);
+
+ context.setFillStyle("black")
+ context.setFontSize(24 * unit)
+ context.fillText(getApp().globalData.config.store_name, 40 * unit, 130 * unit);
}
- }else{
+ } else {
//--昵称---
context.setFontSize(24 * unit)
context.setFillStyle("black")
@@ -3708,9 +3735,9 @@ Page({
//强烈推荐 改许程
var tj_path = "../../../images/share/q_tj.png";
context.drawImage(tj_path, 152 * unit + width, 54 * unit, 85 * unit, 30 * unit);
- context.setFontSize(16 * unit)
+ context.setFontSize(16 * unit);
context.setLineJoin('round'); //交点设置成圆角
- context.setFillStyle("white")
+ context.setFillStyle("white");
context.fillText('强烈推荐', 149 * unit + width + 15 * unit, 76 * unit);
}
@@ -3746,7 +3773,7 @@ Page({
context.setFillStyle("black");
context.setFontSize(21.3 * unit)
th.draw_Text(context, th.data.data.goods_name,
- 38 * unit, 180 * unit, 20 * unit, 300*unit, unit);
+ 38 * unit, 170 * unit, 20 * unit, 300*unit, unit);
//------ 产品的价格 -----
var pri0 = th.data.prom_act.addmoney;
var integral=th.data.prom_act.integral;
@@ -3754,14 +3781,15 @@ Page({
if(integral){text=integral+"积分"; }
if(pri0 && integral){ text+="+";}
if(pri0){ text+="￥"+pri0;}
-
+
+ if(!pri0 && !integral){ text="0积分";}
context.setFillStyle("red");
- context.fillText(text, 38 * unit, 215 * unit);
+ context.fillText(text, 38 * unit, 235 * unit);
}
//---中间大图---
- context.drawImage(th.data.share_goods_img, 68 * unit, 242 * unit, 410 * unit, 410 * unit);
+ context.drawImage(th.data.share_goods_img, 70 * unit, 250 * unit, 408 * unit, 408 * unit);
//-------大图后面就不一样了-----------
switch (type) {
case 0: //普通商品的展示
@@ -3805,23 +3833,33 @@ Page({
}
- //---画线---
- context.setLineWidth(1 * unit)
- context.moveTo(32 * unit, 710 * unit)
- context.lineTo(520 * unit, 710 * unit)
- context.stroke();
- //---文字---
- context.setFillStyle("black")
- context.setFontSize(22 * unit)
+ //---画线---
+ context.setLineWidth(1 * unit)
+ context.moveTo(32 * unit, 710 * unit)
+ context.lineTo(520 * unit, 710 * unit)
+ context.stroke();
+
+ //---文字---
+ context.setFillStyle("black")
+ context.setFontSize(22 * unit)
if(type==0){
// 原来start --->
- context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 776 * unit);
- context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 826 * unit);
+
+ context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 806 * unit);
+ context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 846 * unit);
+ context.setFillStyle("black")
+ context.setFontSize(28 * unit)
+ context.fillText(th.data.sto_sele_name, 40 * unit, 766 * unit);
}else{
- // 原来start --->
- context.fillText("长按识别二维码", 40 * unit, 776 * unit);
- context.fillText("立即开始兑换", 40 * unit, 826 * unit);
+ // 原来start --->
+ // context.fillText("长按识别二维码", 40 * unit, 776 * unit);
+ // context.fillText("立即开始兑换", 40 * unit, 826 * unit);
+ context.fillText("长按识别二维码", 40 * unit, 806 * unit);
+ context.fillText("立即开始兑换", 40 * unit, 846 * unit);
+ context.setFillStyle("black")
+ context.setFontSize(28 * unit)
+ context.fillText(th.data.sto_sele_name, 40 * unit, 766 * unit);
}
//---二维吗图---
@@ -3850,8 +3888,11 @@ Page({
//---文字---
context.setFontSize(22 * unit)
context.setFillStyle("black")
- context.fillText("特惠好物，限时秒杀", 40 * unit, 806 * unit);
- context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 846 * unit);
+ context.fillText("特惠好物，限时秒杀", 40 * unit, 826 * unit);
+ context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 866 * unit);
+ context.setFillStyle("black")
+ context.setFontSize(28 * unit)
+ context.fillText(th.data.sto_sele_name, 40 * unit, 786 * unit);
//---二维吗图---
//-- 自定义海报 --
if(th.data.poster){
@@ -3891,11 +3932,14 @@ Page({
context.setFontSize(22 * unit)
context.fillText("已拼" + th.data.prom_act.buy_num + "份", 166 * unit, 763 * unit);
context.setFillStyle("gray")
- context.fillText("快来和我一起拼团吧！", 40 * unit, 826 * unit);
+ context.fillText("快来和我一起拼团吧！", 40 * unit, 836 * unit);
context.setFillStyle("black")
context.font = 'normal bold 18px sans-serif';
context.setFontSize(21.3 * unit)
- context.fillText("长按识别二维码，立即参团", 40 * unit, 856 * unit);
+ context.fillText("长按识别二维码，立即参团", 40 * unit, 866 * unit);
+ context.setFillStyle("black")
+ context.setFontSize(26 * unit)
+ context.fillText(th.data.sto_sele_name, 40 * unit, 806 * unit);
//---二维吗图---
//-- 自定义海报 --
if(th.data.poster){
@@ -3934,12 +3978,22 @@ Page({
context.fillText("满" + item.rynum + "人", 40 * unit + wi, 786 * unit);
}
//----------------下面部分----------------
+ // context.setFillStyle("gray")
+ // context.fillText("快来和我一起拼团吧！", 40 * unit, 830 * unit);
+ // context.setFillStyle("black")
+ // context.font = 'normal bold 18px sans-serif';
+ // context.setFontSize(22 * unit)
+ // context.fillText("长按识别二维码，立即参团", 40 * unit, 860 * unit);
context.setFillStyle("gray")
- context.fillText("快来和我一起拼团吧！", 40 * unit, 830 * unit);
+ context.fillText("快来和我一起拼团吧！", 40 * unit, 810 * unit);
context.setFillStyle("black")
context.font = 'normal bold 18px sans-serif';
context.setFontSize(22 * unit)
- context.fillText("长按识别二维码，立即参团", 40 * unit, 860 * unit);
+ context.fillText("长按识别二维码，立即参团", 40 * unit, 840 * unit);
+
+ context.setFillStyle("black")
+ context.setFontSize(26 * unit)
+ context.fillText(th.data.sto_sele_name, 40 * unit, 876 * unit);
//-- 自定义海报 --
if(th.data.poster){
@@ -4889,6 +4943,18 @@ Page({
addCart_inte:function(t){
this.add_cart_func_inte(t);
- }
+ },
+
+
+
+
+ onShareTimeline() {
+ return {
+ title:this.data.data.goods_name + '-' + getApp().globalData.config.store_name,
+ imageUrl:this.data.gallery[0].image_url,
+ }
+ },
+
+
});
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index c82463b..78bb381 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -177,6 +177,7 @@
还差{{prom_act.ct_num - item.open_num}}人成团
剩余
+ {{timer[t_ind].day}}天:
{{timer[t_ind].hou}}:
{{timer[t_ind].min}}:
{{timer[t_ind].sec}}
@@ -235,12 +236,13 @@
-
+
{{prom_integral}}
积分
+
- {{filters.toFix(prom_price,2)}}元
+ {{filters.toFix(prom_price,2)}}元
+ 0积分
零售价:￥{{data.market_price}}
@@ -257,7 +259,8 @@
销量：{{prom_act.buy_num}}件
- 折扣：{{filters.pInt((prom_price?prom_price:0)*100/data.shop_price)}}折
+
+ 折扣：{{g_filters.num((prom_price?prom_price:0)*100/data.shop_price)}}折
{{categories3[0].num}}人评价
@@ -364,6 +367,7 @@
销量：{{data.sales_sum}}件
折扣：{{data.disc}}折
+
{{categories3[0].num}}人评价
@@ -1424,14 +1428,15 @@
-
-
+
+
+
x
-
+
diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js
index 27a77af..12f178a 100644
--- a/pages/goods/search/search.js
+++ b/pages/goods/search/search.js
@@ -22,7 +22,12 @@ Page({
tabname: "sort", //排序的字段
adname: "asc", //升降的字段
rq_data:null,
+
+
+ searchRecord: [],
+ keyword: '',
},
+
onLoad: function(t) {
this.data.rq_data=t;
@@ -104,6 +109,9 @@ Page({
if (0 != t.max_price && t.max_price!=undefined) { url += "&min_pirce=" + t.min_pirce + "&max_price=" + t.max_price;}
if (url != this.data.baseUrl) return this.requestSearch(url);
this.openSearchModal();
+
+ // 获取历史搜索记录
+ this.getHistorySearch();
},
changeTab: function(t) {
var ord = t.currentTarget.dataset.href;
@@ -176,18 +184,23 @@ Page({
});
},
submitSearch: function(t) {
+ console.log(111);
this.search(t.detail.value.word);
+
+
},
//热搜关键字
searchHotWord: function(t) {
- this.search(t.currentTarget.dataset.word);
+ this.historyRecord();
+ this.search(t.currentTarget.dataset.word);
},
//-----点击搜索按钮----
search: function(t) {
if ("string" != typeof t || "" == t) return a.showWarning("请输入搜索关键词");
this.data.key_str=t;
+ this.historyRecord();
this.resetData(), this.requestSearch(this.data.baseUrl + "&key_str=" + encodeURIComponent(t));
},
@@ -253,4 +266,56 @@ Page({
func(ob);
})
},
+
+
+ getInput(e) {
+ this.setData({
+ keyword: e.detail.value
+ });
+ },
+
+ historyRecord() {
+ let self = this;
+ let keyword = this.data.key_str;
+ let searchRecord = this.data.searchRecord;
+
+ if(keyword) {
+ if(searchRecord.indexOf(keyword) > -1) {
+ // 已经存在该值
+ return;
+ } else {
+ if(searchRecord.length >= 10) {
+ searchRecord.pop(); // 删除最早的一条记录
+ };
+ searchRecord.unshift(keyword);
+
+ // // 将历史记录添加到缓存中
+ wx.setStorage({
+ key: 'searchRecord',
+ data: searchRecord,
+ success: function(res) {
+ self.setData({
+ searchRecord,
+ })
+ }
+ })
+ };
+ };
+ },
+
+
+
+
+ getHistorySearch() {
+ this.setData({
+ searchRecord: wx.getStorageSync('searchRecord') || [] //若无存储则为空
+ });
+ },
+
+ clearSearchRecord() {
+ wx.clearStorageSync('searchRecord');
+ this.setData({
+ searchRecord: []
+ });
+ },
});
\ No newline at end of file
diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml
index 66d132a..4f25ce3 100644
--- a/pages/goods/search/search.wxml
+++ b/pages/goods/search/search.wxml
@@ -162,7 +162,7 @@
+
+
+ 历史搜索
+
+
+
+
+ {{item}}
+
+
+ 暂无历史搜索记录
+
\ No newline at end of file
diff --git a/pages/goods/search/search.wxss b/pages/goods/search/search.wxss
index cb72331..1711e17 100644
--- a/pages/goods/search/search.wxss
+++ b/pages/goods/search/search.wxss
@@ -298,3 +298,14 @@
/* line-height: 38rpx; */
flex-grow: 1;
}
+
+.history {
+ background-color: #f0f0f0;
+ color: #7b7b7b;
+ border: none;
+ margin-bottom: 8rpx;
+}
+
+.history:first-of-type {
+ margin-left: 0;
+}
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 9535eaf..811ce34 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -884,7 +884,17 @@ Page({
},
-
+ onShareTimeline() {
+ // getApp().getConfig(function(t) {
+ // return {
+ // title: '首页-' + getApp().globalData.config.store_name,
+ // }
+ // });
+
+ return {
+ title: '首页-' + getApp().globalData.config.store_name,
+ }
+ },
});
\ No newline at end of file
diff --git a/pages/index/index/index.json b/pages/index/index/index.json
index 66a0ff2..63d46fb 100644
--- a/pages/index/index/index.json
+++ b/pages/index/index/index.json
@@ -1,5 +1,4 @@
-{
-
+{
"usingComponents": {
"goods_recommend":"/components/goods_list/goods_list",
"nav": "/components/diy_nav/diy_nav",
@@ -17,6 +16,8 @@
"assist":"/components/diy_assist/diy_assist",
"picMax": "/components/diy_picMax/diy_picMax",
"mvideo": "/components/diy_video/diy_video",
- "service": "/components/diy_service/diy_service"
- }
+ "service": "/components/diy_service/diy_service",
+ "scan": "/components/diy_scan/diy_scan"
+ },
+ "enablePullDownRefresh": false
}
\ No newline at end of file
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 4d4ee9c..66f3926 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -348,6 +348,10 @@
+
+
+
+
diff --git a/pages/team/team_more/team_more.wxml b/pages/team/team_more/team_more.wxml
index 98f6560..c2a0582 100644
--- a/pages/team/team_more/team_more.wxml
+++ b/pages/team/team_more/team_more.wxml
@@ -17,7 +17,9 @@
还差{{pt_act.ct_num - item.open_num}}人成团
- 剩余{{item.djs.hou}}:
+ 剩余
+ {{item.djs.day}}天:
+ {{item.djs.hou}}:
{{item.djs.min}}:
{{item.djs.sec}}结束
diff --git a/pages/template/index.json b/pages/template/index.json
index 1443fce..418f686 100644
--- a/pages/template/index.json
+++ b/pages/template/index.json
@@ -18,6 +18,8 @@
"assist":"/components/diy_assist/diy_assist",
"picMax": "/components/diy_picMax/diy_picMax",
"mvideo": "/components/diy_video/diy_video",
- "service": "/components/diy_service/diy_service"
- }
+ "service": "/components/diy_service/diy_service",
+ "scan": "/components/diy_scan/diy_scan"
+ },
+ "enablePullDownRefresh": false
}
\ No newline at end of file
diff --git a/pages/template/index.wxml b/pages/template/index.wxml
index 0dbbeea..452f71f 100644
--- a/pages/template/index.wxml
+++ b/pages/template/index.wxml
@@ -57,6 +57,10 @@
+
+
+
+
diff --git a/pages/user/assistance/assistance.js b/pages/user/assistance/assistance.js
index 7e78f41..959e9fd 100644
--- a/pages/user/assistance/assistance.js
+++ b/pages/user/assistance/assistance.js
@@ -228,6 +228,22 @@ Page({
var help_id = this.data.help_id;
var taskid=e.currentTarget.dataset.taskid;
getApp().goto("/pages/user/assistance/task_assistance?help_id=" + help_id+"&taskid="+taskid);
- }
+ },
+
+ onShareAppMessage(res) {
+ if (res.from === 'button') {
+ // 来自页面内转发按钮
+ console.log(res.target)
+ }
+ return {
+ // title: '自定义转发标题',
+ }
+ },
+
+ onShareTimeline() {
+ return {
+ title: '好友助力-' + getApp().globalData.config.store_name,
+ }
+ },
})
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index 4a3e699..13e40e9 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -213,19 +213,19 @@
-
+
助力活动
-
+
我的权益
-
+
{{item.name}}
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 566f867..c7aab13 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -222,7 +222,7 @@
单价
- ￥{{i.Price}}({{i.PosPrice}})
+ ￥{{i.Price}}({{i.PosPrice}})
金额