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_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/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..7b197d2 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 c875e41..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});
+ }
+ })
+
},
diff --git a/pages/activity/seckill_list/seckill_list.wxml b/pages/activity/seckill_list/seckill_list.wxml
index 8de10eb..646a37e 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 1b7fe42..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) {
@@ -1013,12 +1022,11 @@ Page({
if(url[0]!='/') url='/'+url;
getApp().goto(url);
},
-
-
- onShareTimeline() {
- return {
- title: '商品分类-' + getApp().globalData.config.store_name,
- }
- },
+
+ 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/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 2b62622..e502c2f 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -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);
}
})
}
@@ -3605,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", {
@@ -3776,7 +3781,8 @@ 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);
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index ff7f676..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}}
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 @@
+
+
+
+