diff --git a/app.json b/app.json
index df3ae1a..36803e1 100644
--- a/app.json
+++ b/app.json
@@ -2,8 +2,7 @@
"pages": [
"pages/index/index/index",
"pages/goods/categoryList/categoryList",
- "pages/cart/cart/cart",
-
+ "pages/cart/cart/cart",
"pages/cart/cart4/cart4",
"pages/goods/goodsInfo/goodsInfo",
"pages/goods/goodsList/goodsList",
@@ -14,19 +13,16 @@
"pages/user/order_list/order_list",
"pages/user/order_detail/order_detail",
"pages/user/address_list/address_list",
- "pages/user/userinfo/userinfo",
- "pages/user/return_goods_list/return_goods_list",
+ "pages/user/userinfo/userinfo",
"pages/user/coupon/coupon",
"pages/user/checkcoupon/checkcoupon",
- "pages/user/add_address/add_address",
- "pages/user/return_goods_info/return_goods_info",
- "pages/user/return_goods/return_goods",
+ "pages/user/add_address/add_address",
"pages/user/express/express",
"pages/activity/seckill_list/seckill_list",
"pages/activity/pind_list/pind_list",
"pages/team/team_success/team_success",
"pages/team/team_show/team_show",
- "pages/team/team_ping/team_ping",
+
"pages/user/userqy/userqy",
"pages/user/user_spsy/user_spsy",
"pages/payment/pay_success/pay_success",
@@ -54,7 +50,7 @@
"pages/user/assistance/assistance",
"pages/store/index",
"pages/giftpack/festival/festival",
- "pages/team/team_more/team_more",
+
"pages/distribution/distribution",
"pages/template/index"
@@ -231,7 +227,12 @@
"pages": [
"pages/wuliu/wuliu",
"pages/free_delivery/free_delivery",
- "pages/xcxServiceChat/xcxServiceChat"
+ "pages/xcxServiceChat/xcxServiceChat",
+ "pages/team/team_ping/team_ping",
+ "pages/team/team_more/team_more",
+ "pages/user/return_goods_info/return_goods_info",
+ "pages/user/return_goods_list/return_goods_list",
+ "pages/user/return_goods/return_goods"
]
}
@@ -252,6 +253,7 @@
"backgroundColor": "#ffffff",
"enablePullDownRefresh": true
},
+ "__usePrivacyCheck__": true,
"tabBar": {
"custom": true,
"color": "#6e6d6b",
diff --git a/app.wxss b/app.wxss
index 3e5ba4b..0d85c34 100644
--- a/app.wxss
+++ b/app.wxss
@@ -367,6 +367,7 @@ button {
.ai_end{
align-items: flex-end;
}
+
.cover-layer {
position: fixed;
left: 0;
@@ -1332,4 +1333,10 @@ background: #ffe3e2;
100% {
transform: translateY(550rpx);
}
-}
\ No newline at end of file
+}
+
+checkbox .wx-checkbox-input {
+ width: 32rpx !important;
+ height: 32rpx !important;
+ margin-right: 16rpx;
+}
diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js
index 4cf2155..f6748d4 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.js
+++ b/components/diy_goodsGroup/diy_goodsGroup.js
@@ -6,6 +6,7 @@ var t = getApp(),
ut = i,
s = require("../../utils/common.js");
var regeneratorRuntime = require('../../utils/runtime.js');
+var g_filter = require('./filter');
Component({
properties: {
@@ -60,7 +61,8 @@ Component({
//判断接口是不是调用完成
is_get:0,
- is_retail_price:0 //是否显示零售价
+ is_retail_price:0, //是否显示零售价
+ // action_index:0, //选中的tab项
},
lifetimes: {
@@ -96,7 +98,8 @@ Component({
}
if (idlist) idlist = ut.sub_last(idlist);
nav_list[ij].idlist = idlist;
- }
+ }
+ // console.error(nav_list);
this.setData({ nav_list: nav_list, is_nav: parseInt(this.data.object.is_nav) });
}
@@ -174,7 +177,7 @@ Component({
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;
@@ -307,7 +310,7 @@ Component({
bind_bnerr3: function (e) {
var _errImg = e.target.dataset.errorimg;
var _errObj = {};
- _errObj[_errImg] = this.data.imghost + "/public/images/default_goods_image_240.gif";
+ _errObj[_errImg] = this.data.imghost + "/public/images/default_goods_image_240.gif";
this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
},
@@ -404,7 +407,7 @@ Component({
this.data.classstyle_id = nav_item.classstyle;
this.data.wgroup = nav_item.wgroup;
}
-
+
this.data.isyhgoods = this.data.is_recommend = this.data.is_hot = this.data.is_new = 0;
//推荐，热卖，新品
@@ -519,8 +522,6 @@ Component({
if (res && res.data) prom = res.data.data;
if (prom != null && prom.is_end == 0 && prom.end_time > now && (prom.start_time < now || (prom.show_time && prom.show_time < now))) {
item.prom_price = res.data.data.price;
- console.log(res.data.data)
- console.log('11111');
if (res.data.data.user_price) item.prom_price = res.data.data.user_price;
var vNum = res.data.data.virtual_num ? res.data.data.virtual_num : 0;
@@ -538,23 +539,73 @@ Component({
} else {
th.data.requestData.push(item);
}
- }
-
- if (th.data.object.column == 5) {
- var arr = new Array();
- var rData = th.data.requestData;
- //--三个三个一组---
- for (var i = 0; i < rData.length; i += 3) {
- arr.push(rData.slice(i, i + 3));
- }
- th.setData({ goods_array: arr, page: th.data.currentPage - 1,is_get:1 });
- } else {
- th.setData({
- goods_array: th.data.requestData,
- page: th.data.currentPage - 1,
- is_get:1
- });
- }
+ }
+
+ // 新版组件价格处理
+ th.data.requestData.map(ite=>{
+ let price = 0
+ if (ite.prom_price || ite.prom_integral) {
+ price = ite.prom_price + ''
+ }else{
+ if (g_filter.is_has_rank(th.data.rank_switch,ite)) {
+ if (th.data.card_field) {
+ if (ite[th.data.card_field] > 0) {
+ price = ite[th.data.card_field] + ''
+ }else{
+ price = ite.shop_price + ''
+ }
+ }else{
+ price = ite.shop_price + ''
+ }
+ }else{
+ price = ite.shop_price + ''
+ }
+ }
+
+ if (price && price.indexOf('.') > -1) {
+ let priceArr = price.split(".")
+ ite.price_n = priceArr[0]
+ ite.price_xs = priceArr[1]
+ }else{
+ ite.price_n = price
+ }
+
+ })
+ console.error(th.data.requestData);
+ //-----------------------
+ if (th.data.object.column_action_name) {
+ if (th.data.object.style == 6 || th.data.object.style == 5) {
+ var arr = new Array();
+ var rData = th.data.requestData;
+ //--三个三个一组---
+ for (var i = 0; i < rData.length; i += 3) {
+ arr.push(rData.slice(i, i + 3));
+ }
+ th.setData({ goods_array: arr, page: th.data.currentPage - 1,is_get:1 });
+ } else {
+ th.setData({
+ goods_array: th.data.requestData,
+ page: th.data.currentPage - 1,
+ is_get:1
+ });
+ }
+ }else{
+ if (th.data.object.column == 5) {
+ var arr = new Array();
+ var rData = th.data.requestData;
+ //--三个三个一组---
+ for (var i = 0; i < rData.length; i += 3) {
+ arr.push(rData.slice(i, i + 3));
+ }
+ th.setData({ goods_array: arr, page: th.data.currentPage - 1,is_get:1 });
+ } else {
+ th.setData({
+ goods_array: th.data.requestData,
+ page: th.data.currentPage - 1,
+ is_get:1
+ });
+ }
+ }
},
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml
index e4c0fc1..ea8f46d 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxml
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxml
@@ -6,929 +6,1358 @@
-
-
-
-
-
- {{item.title}}
+
+
-
-
-
-
- {{item.title}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{item.title}}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ {{item.title}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{aitem.goods_name}}
+
+
+
+ 销量：{{aitem.sales_sum}}件
+
+
+
+ ￥{{aitem.price_n}}.{{aitem.price_xs}}+ {{aitem.prom_integral}}积分
+ ￥{{aitem.market_price}}
+
+
+
+
+
+ {{object.button_content}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- {{item.goods_name}}
-
-
-
-
- {{item.prom_integral}}积分
- +
- ￥{{item.prom_price}}
-
- ￥{{item.market_price}}
-
-
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item[card_field],2)}}
-
-
- {{card_name}}
-
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
- ￥
- {{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}
-
-
- {{g_filter.get_card_price(item,card_list,1)}}
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
- ￥{{item.shop_price}}
- ￥{{item.market_price}}
-
+
+
+
+
+
+ 已售罄
+
+
+
+
+ {{aitem.goods_name}}
+
+ 销量：{{aitem.sales_sum}}件
+
+
+
+
+
+ ￥{{aitem.price_n}}.{{aitem.price_xs}}+ {{aitem.prom_integral}}积分
+ ￥{{aitem.market_price}}
+
+
+
+
+ {{object.button_content}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+ 已售罄
+
+
+
+
+ {{aitem.goods_name}}
+
+ 销量{{aitem.sales_sum}}件
+
+
+
+
+
+ ￥{{aitem.price_n}}.{{aitem.price_xs}}+ {{aitem.prom_integral}}积分
+ ￥{{aitem.market_price}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已售罄
+
+
+
+
+
+ {{aitem.goods_name}}
+
+ 销量{{aitem.sales_sum}}件
+
+
+
+
+
+ ￥{{aitem.price_n}}.{{aitem.price_xs}}￥{{aitem.market_price}}+ {{aitem.prom_integral}}积分
+
+
+
+
+ {{object.button_content}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已售罄
+
+
-
- 销量：{{item.sales_sum}}件
-
-
-
-
-
-
-
- 马上抢
- 立即购买
-
-
-
-
-
-
-
-
+ -->
+
+
+ {{aitem.goods_name}}
+
+
+
+ 销量：{{aitem.sales_sum}}件
+
+
+
+
+ ￥{{aitem.price_n}}.{{aitem.price_xs}}+ {{aitem.prom_integral}}积分
+ ￥{{aitem.market_price}}
+
+
+
+
+
+ {{object.button_content}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已售罄
+
+
+
+
+ {{aitem.goods_name}}
+
+ 销量：{{aitem.sales_sum}}件
+
+
+
+
+
+ ￥{{aitem.price_n}}.{{aitem.price_xs}}+ {{aitem.prom_integral}}积分
+ ￥{{aitem.market_price}}
+
+
+
+
+ {{object.button_content}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已售罄
+
+
+
+
+ {{aitem.goods_name}}
+
+ 销量：{{aitem.sales_sum}}件
+
+
+
+
+
+ ￥{{aitem.price_n}}.{{aitem.price_xs}}+ {{aitem.prom_integral}}积分
+ ￥{{aitem.market_price}}
+
+
+
+
+ {{object.button_content}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}
+
+
+ {{aitem.goods_name}}
+
+ 已秒{{aitem.sales_sum}}件
+ 还剩余{{aitem.residue}}件
+
+
+
+
+ ￥{{aitem.price}}
+ ￥{{aitem.market_price}}
+
+
+
+
+ {{object.button_content}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已售罄
+
+
+
+
+ {{aitem.goods_name}}
+
+ 销量：{{aitem.sales_sum}}件
+
+
+
+
+
+ ￥{{aitem.price_n}}.{{aitem.price_xs}}+ {{aitem.prom_integral}}积分
+ ￥{{aitem.market_price}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{loadText}}
-
+
+
+
+
+ {{loadText}}
+
+
+
+
+
+
+ 暂无数据
+
+
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.goods_name}}
+
+
+
+
+ {{item.prom_integral}}积分
+ +
+ ￥{{item.prom_price}}
+
+ ￥{{item.market_price}}
+
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item[card_field],2)}}
+
+
+ {{card_name}}
+
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+ ￥
+ {{item.market_price}}
-
- {{item.goods_name}}
-
-
-
-
- {{item.prom_integral}}积分
- +
- ￥{{item.prom_price}}
-
- ￥{{item.market_price}}
-
-
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item[card_field],2)}}
-
-
- {{card_name}}
-
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
- ￥
- {{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}
-
-
- {{g_filter.get_card_price(item,card_list,1)}}
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
- ￥{{item.shop_price}}
- ￥{{item.market_price}}
-
-
-
-
-
- 销量：{{item.sales_sum}}件
-
-
-
-
-
-
-
- 马上抢
- 立即购买
-
-
-
-
-
-
-
-
-
+
+
+
+
+ ￥
+ {{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}
+
+
+ {{g_filter.get_card_price(item,card_list,1)}}
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+
+ ￥{{item.shop_price}}
+ ￥{{item.market_price}}
+
+
+
+
+
+
+
+ 销量：{{item.sales_sum}}件
+
+
+
+
+
+
+
+ 马上抢
+ 立即购买
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.goods_name}}
+
+
+
+
+ {{item.prom_integral}}积分
+ +
+ ￥{{item.prom_price}}
+ ￥{{item.market_price}}
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item[card_field],2)}}
+
+
+ {{card_name}}
+
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}
+
+
+ {{g_filter.get_card_price(item,card_list,1)}}
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+ ￥{{item.shop_price}}
+ ￥{{item.market_price}}
+
+
+
+
+ 销量：{{item.sales_sum}}件
+
+
+
+
+
+
+ 马上抢
+ 立即购买
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.goods_name}}
+
+
+
+ {{item.prom_integral}}积分
+ +
+ ￥{{item.prom_price}}
+
+ ￥{{item.market_price}}
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item[card_field],2)}}
+
+
+ {{card_name}}
+
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
-
-
-
- {{item.goods_name}}
-
-
-
- {{item.prom_integral}}积分
- +
- ￥{{item.prom_price}}
-
- ￥{{item.market_price}}
-
-
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item[card_field],2)}}
-
-
- {{card_name}}
-
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
- ￥
- {{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}
-
-
- {{g_filter.get_card_price(item,card_list,1)}}
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
- ￥{{item.shop_price}}
- ￥{{item.market_price}}
-
-
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}
+
+
+ {{g_filter.get_card_price(item,card_list,1)}}
-
-
- 销量：{{item.sales_sum}}件
-
-
-
-
-
-
-
- 马上抢
- 立即购买
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+ ￥{{item.shop_price}}
+ ￥{{item.market_price}}
+
+
+
+
+
+ 销量：{{item.sales_sum}}件
+
+
+
+
+
+
+
+ 马上抢
+ 立即购买
+
+
+
+
+
+
+
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.goods_name}}
+
+
+
+
+ {{item.prom_integral}}积分
+ +
+ ￥{{item.prom_price}}
+
+ ￥{{item.market_price}}
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item[card_field],2)}}
+
+
+ {{card_name}}
+
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
-
-
-
-
-
-
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+ ￥
+ {{item.market_price}}
+
-
-
-
-
-
+
+
+
+
+ ￥
+ {{filter.toFix(g_filter.get_card_price(item,card_list,0),2) && is_no_plus}}
+
+ {{g_filter.get_card_price(item,card_list,1)}}
+
+
+
-
-
-
-
-
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
-
-
- {{item.goods_name}}
-
+
+
-
-
- {{item.prom_integral}}积分
- +
- ￥{{item.prom_price}}
-
- ￥{{item.market_price}}
-
-
-
+
+ ￥{{item.shop_price}}
+ ￥{{item.market_price}}
+
+
+
+
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item[card_field],2)}}
-
-
- {{card_name}}
-
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
- ￥
- {{filter.toFix(g_filter.get_card_price(item,card_list,0),2) && is_no_plus}}
-
- {{g_filter.get_card_price(item,card_list,1)}}
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
- ￥{{item.shop_price}}
- ￥{{item.market_price}}
-
+
+ 销量：{{item.sales_sum}}件
-
-
-
-
- 销量：{{item.sales_sum}}件
-
-
-
-
-
-
-
- 马上抢
- 立即购买
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ 马上抢
+ 立即购买
+
+
+
+
+
+
-
+
+
+
+
-
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{aitem.goods_name}}
+
+
+
+ {{aitem.prom_integral}}
+ +
+ ￥{{aitem.prom_price}}
+
+ ￥{{aitem.market_price}}
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(aitem[card_field],2)}}
+
+
+ {{card_name}}
+
+
+
+
+
+
+ ￥
+ {{aitem.market_price}}
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(aitem.shop_price,2)}}
+
+
+
+
+
+ ￥
+ {{aitem.market_price}}
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(aitem.shop_price,2)}}
+
+
+
+ ￥
+ {{aitem.market_price}}
-
-
-
- {{aitem.goods_name}}
-
-
-
- {{aitem.prom_integral}}
- +
- ￥{{aitem.prom_price}}
-
- ￥{{aitem.market_price}}
-
-
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(aitem[card_field],2)}}
-
-
- {{card_name}}
-
-
-
-
-
-
- ￥
- {{aitem.market_price}}
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(aitem.shop_price,2)}}
-
-
-
-
-
- ￥
- {{aitem.market_price}}
-
-
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(aitem.shop_price,2)}}
-
-
-
- ￥
- {{aitem.market_price}}
-
-
-
-
-
-
- ￥
- {{filter.toFix(g_filter.get_card_price(aitem,card_list,0),2)}}
-
-
- {{g_filter.get_card_price(aitem,card_list,1)}}
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(aitem.shop_price,2)}}
-
-
-
-
-
- ￥
- {{aitem.market_price}}
-
-
-
-
-
-
- ￥{{aitem.shop_price}}
- ￥{{aitem.market_price}}
-
-
+
+
+
+
+ ￥
+ {{filter.toFix(g_filter.get_card_price(aitem,card_list,0),2)}}
+
+
+ {{g_filter.get_card_price(aitem,card_list,1)}}
+
-
-
- 销量：{{aitem.sales_sum}}件
-
-
-
-
-
-
-
- 马上抢
- 立即购买
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(aitem.shop_price,2)}}
+
+
+
+
+
+ ￥
+ {{aitem.market_price}}
+
+
+
+
+
+
+ ￥{{aitem.shop_price}}
+ ￥{{aitem.market_price}}
+
+
+
+
+
+ 销量：{{aitem.sales_sum}}件
-
-
-
-
-
-
+
+
+
+
+
+
+ 马上抢
+ 立即购买
+
+
+
+
+
+
+
+
+
-
-暂无数据
-
-
-
+
+
+
+
+
+
+
+ 暂无数据
+
+
+
+
\ No newline at end of file
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxss b/components/diy_goodsGroup/diy_goodsGroup.wxss
index e76398f..b808bea 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxss
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxss
@@ -919,3 +919,291 @@ top: 10rpx;
.jcc{ justify-content: center;}
.loader{ width:750rpx; margin:20rpx 0}
+.ellipsis-2n {
+
+ /* height: 97rpx; */
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+}
+.pdlf10{
+ padding: 0 10rpx;
+}
+.new_item1{
+ width: 100%;
+ overflow: hidden;
+}
+
+.new_item1_image{
+ width: 100%;
+ /* max-width: 100%;
+ max-height: 100%; */
+}
+.new_item1_time{
+ height: 50rpx;
+ background: #f23030;
+ color: #fff;
+ /* font-size: 25rpx; */
+ font-size: 24rpx;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ opacity:.8;
+ /* padding: 0rpx 30rpx; */
+
+}
+.new_item1_time image{
+ width: 188rpx;
+ height: 52rpx;
+}
+.new_item1_goods_name{
+ padding: 10rpx 10rpx 0rpx;
+ /* font-size: 26rpx; */
+ font-size: 28rpx;
+ width: 100%;
+ box-sizing: border-box;
+ color: #333333;
+}
+.new_item1_price{
+ display: flex;
+ /* padding: 0 10rpx; */
+ align-items: center;
+ justify-content: space-between;
+ /* font-size: 26rpx; */
+ font-size: 24rpx;
+ padding: 0 10rpx 10rpx;
+}
+.clor{
+ /* color: rgba(196, 24, 45, 1); */
+ color: #ec0022 !important;
+}
+.clor7b{
+ color: #7b7b7b;
+}
+.new_item1_but{
+ width: 130rpx;
+ height: 60rpx;
+ color: #fff;
+ background-color: #f23030;
+ line-height: 60rpx;
+ text-align: center;
+ border-radius: 15rpx;
+}
+.new_item1_but1{
+ border-radius: 50rpx !important;
+}
+.new_item1_but2{
+ border-radius: 50rpx !important;
+ background-color: rgba(0, 0, 0, 0) !important;
+ color: #f23030 !important;
+ border: 1rpx solid #f23030 !important;
+}
+.new_item1_but3{
+ background-color: rgba(0, 0, 0, 0) !important;
+ color: #f23030 !important;
+ border: 1rpx solid #f23030 !important;
+}
+
+
+
+
+.new_item1_box{
+ /* padding-top: 17rpx; */
+ width: 100%;
+ box-sizing: border-box;
+ overflow: hidden;
+}
+
+.aborder{
+ border: 1px solid #e8e8e8;
+}
+.bgf{
+ background-color: #fff;
+}
+.boxsha{
+ /* box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.25); */
+ /* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */
+ box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 3px 10px 0 rgba(0, 0, 0, 0.19);
+}
+.but_radius85{
+ border-radius:289rpx;
+}
+.but_radius5{
+ border-radius:8px;
+}
+.imgBox{
+ position: relative;
+}
+.imgBox_img{
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 74rpx;
+ height: 70rpx;
+
+}
+
+.aspect_ratio1{
+ aspect-ratio:1/1;
+}
+.aspect_ratio2{
+ aspect-ratio:16/9;
+}
+.aspect_ratio3{
+ aspect-ratio:3/2;
+}
+.aspect_ratio4{
+ aspect-ratio:3/4;
+}
+.container1 {
+ position: relative;
+ width:100%;
+ padding-top: 100%;
+ overflow: hidden;
+}
+.container2 {
+ position: relative;
+ width:100%;
+ padding-top: 56.25%;
+ overflow: hidden;
+}
+.container3 {
+ position: relative;
+ width:100%;
+ padding-top: 66.67%;
+ overflow: hidden;
+}
+.container4 {
+ position: relative;
+ width:100%;
+ padding-top: 133.33%;
+ overflow: hidden;
+
+}
+
+.images1 {
+ display: block;
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ object-fit: cover;
+
+}
+
+.flex2{
+ display: flex;
+ /* align-items: center; */
+ justify-content: space-between;
+ flex-wrap: wrap;
+ box-sizing: border-box;
+}
+.flex2:after {
+ content: "";
+ width: 30%;
+ height: 0px;
+ visibility: hidden;
+ }
+
+ .boxpad{
+ /* padding:11rpx 9rpx; */
+ box-sizing: border-box;
+ }
+ .pricefs28{
+ font-size: 28rpx !important;
+ }
+ .pricefs42{
+ font-size: 42rpx !important;
+ }
+ .pricefs38{
+ font-size: 38rpx !important;
+ }
+ .imgbox1{
+ width: 60rpx;
+ height: 60rpx;
+ }
+ .topBox{
+ position: relative;
+ }
+
+ .item_float{
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ box-sizing: border-box;
+ }
+
+
+ /* 新版tab样式 */
+ .tabBox{
+ min-width: 100%;
+ /*height: 30px;*/
+ padding: 10rpx 0;
+ display: flex;
+ align-items: center;
+ /*justify-content: space-around;*/
+ font-size: 28rpx;
+ font-weight: bold;
+ overflow-x: auto;
+ margin-bottom: 20rpx;
+ /* min-width: 25%; */
+ }
+
+/* 不显示滚动条 */
+.tabBox::-webkit-scrollbar {
+ display: none;
+}
+ .tab{
+ /*flex-grow: 1;*/
+ flex-shrink: 0;
+ /*color: #f23030;*/
+ padding: 0 20rpx;
+ /* padding: 0 35rpx; */
+ color: rgba(166, 166, 166, 1);
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 100%;
+ position: relative;
+ margin: auto;
+ /* min-width: 25%; */
+ }
+ .tab1{
+ position: absolute;
+ bottom: -8rpx;
+ left: 0;
+ right: 0;
+ margin: auto;
+ width: 40%;
+ height: 4rpx;
+ /* background-color: rgba(196,24,45,.8); */
+ background-color: #f23030;
+ opacity: .8;
+ }
+ .tab_action{
+ background-color: #f23030;
+ color: #fff;
+ border: none !important;
+ opacity: .8;
+ /* border-color: #f23030 !important; */
+ }
+ .tab2{
+ padding: 0 !important;
+ }
+ .tab2 view{
+ padding: 10rpx 35rpx;
+ flex-grow: 1;
+ }
+ .tab3{
+ padding: 6rpx 16rpx;
+ border: 1px solid rgba(166, 166, 166, 1);
+ border-radius: 20rpx;
+ box-sizing: border-box;
+ }
+
diff --git a/components/diy_goodsGroup/filter.js b/components/diy_goodsGroup/filter.js
new file mode 100644
index 0000000..d92ae8e
--- /dev/null
+++ b/components/diy_goodsGroup/filter.js
@@ -0,0 +1,115 @@
+//获取样式
+var get_class = function(column,position) {
+ //--列的情况
+ if(column==1){ return "zs_t"+position; }
+ //--俩列的情况
+ if(column==2){ return "zs_t"+position+"_2l"; }
+ //--三列的情况
+ if(column==3){ return "zs_t"+position+"_3l"; }
+ //----列表的情况-----
+ if(column==4 ){ return "zs_t1_x"+position; }
+//--滑动的情况
+if(column==5){ return "zs_t"+position+"_3l"; }
+}
+
+
+var g_filters = {
+ //判断边框类型
+ get_border_type:function(type){
+ if(!type) type=0;
+ var type=parseInt(type);
+ switch(type){
+ case 0: return "border_zhijiao";
+ case 1: return "border_yuanjiao";
+ }
+ return "";
+ },
+
+ //-- 判断是不是有等级价 --
+ is_has_rank:function(rank_switch,item){
+ if(!rank_switch) return false;
+ if(item.cardprice1 || item.cardprice2 || item.cardprice3) {return true}
+ return false;
+ },
+
+ //-- 判断,不是等级会员时候，要显示的最低等级价和名称 --
+ get_card_price:function(goods,all_card,type){
+ var price1=parseFloat(goods['cardprice1']);
+ var price2 = parseFloat(goods['cardprice2']);
+ var price3 = parseFloat(goods['cardprice3']);
+ if(!all_card){
+ if(type==0) return 0;
+ return "";
+ }
+
+ var min_price=null;
+ var min_name=null;
+ //---设置对应的价格名字----
+ for(var i=0;i<3;i++) {
+ var vl=all_card[i];
+ if(!vl) continue;
+ if(vl['CorrPrice']=="Price1" && price1>0)
+ {
+ if(min_price==null) {
+ min_price=price1;min_name=vl['CardName'];
+ }
+ else if(price10)
+ {
+ if(min_price==null) {
+ min_price=price2;min_name=vl['CardName'];
+ }
+ else if(price20)
+ {
+ if(min_price==null) {
+ min_price=price3;min_name=vl['CardName'];
+ }
+ else if(price34 ) min_name=min_name.substring(0, 4);
+ return min_name;
+ },
+
+
+ get_url_by_type: function(item) {
+ var url = '';
+ if(item.prom_type == 9) {
+ url = '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id;
+ }
+ else if(item.prom_type==8){
+ url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id
+ }
+ else {
+ url = '/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id + '&prom_id=' + item.prom_id + '&prom_type=' + item.prom_type;
+ };
+ return url;
+ },
+
+}
+
+
+module.exports = {
+ get_class: get_class,
+ is_has_rank:g_filters.is_has_rank,
+ get_card_price:g_filters.get_card_price,
+ get_border_type:g_filters.get_border_type,
+ get_url_by_type: g_filters.get_url_by_type,
+}
diff --git a/components/diy_goodsGroup/g_filter.wxs b/components/diy_goodsGroup/g_filter.wxs
index e4ca724..222344f 100644
--- a/components/diy_goodsGroup/g_filter.wxs
+++ b/components/diy_goodsGroup/g_filter.wxs
@@ -23,7 +23,7 @@ var g_filters = {
case 1: return "border_yuanjiao";
}
return "";
- }
+ },
//-- 判断是不是有等级价 --
is_has_rank:function(rank_switch,item){
diff --git a/components/nodata/nodata.js b/components/nodata/nodata.js
index 9752283..3c4deb9 100644
--- a/components/nodata/nodata.js
+++ b/components/nodata/nodata.js
@@ -1,5 +1,15 @@
Component({
- externalClasses: ['nodata-container'],
+ externalClasses: ['nodata-container'],
+ //在.js文件中
+ properties: {
+ // 简单的定义方式
+ // max:Number
+ // 完整的定义方式
+ title:{
+ type:String,
+ value:10
+ }
+ },
/*** 页面的初始数据***/
data: {
diff --git a/components/nodata/nodata.wxml b/components/nodata/nodata.wxml
index 536a987..8f008a2 100644
--- a/components/nodata/nodata.wxml
+++ b/components/nodata/nodata.wxml
@@ -1,4 +1,4 @@
- 暂无数据
+ {{ftitle?title:'暂无数据'}}
diff --git a/components/privacy_pop/privacy_pop.js b/components/privacy_pop/privacy_pop.js
new file mode 100644
index 0000000..1ec796c
--- /dev/null
+++ b/components/privacy_pop/privacy_pop.js
@@ -0,0 +1,69 @@
+var t = getApp(),os =t.globalData.setting;
+Component({
+ properties: {
+ },
+ data: {
+ show_pri:0,
+ is_all_ok:0,
+ store:null
+ },
+ //获取一下商家的信息
+ ready: function () {
+ getApp().getConfig(e=>{
+ this.setData({store:e})
+ })
+ },
+
+ methods: {
+ //判断用户有没有同意安全隐私
+ check_pri_show(){
+ wx.getPrivacySetting({
+ success: res => {
+ console.log(res) // 返回结果为: res = { needAuthorization: true/false, privacyContractName: '《xxx隐私保护指引》' }
+ if (res.needAuthorization) {
+ // 需要弹出隐私协议
+ this.setData({
+ show_pri: 1
+ })
+ }else{
+ this.setData({
+ show_pri: 0
+ })
+ this.triggerEvent('agree_pri');// 调用同意的函数
+ }
+ }
+ })
+ },
+ //--- 分享 ---
+ goto:function (e) {
+ var url= e.currentTarget.dataset.url;
+ getApp().goto(url);
+ },
+ need_ok:function (){
+ wx.showToast({
+ title: '请您先阅读和勾选指定的内容',
+ icon: 'none',
+ });
+ },
+ //同意隐私的内容
+ AgreePrivacy:function (){
+ this.setData({show_pri:0,});
+ this.triggerEvent('agree_pri');// 调用同意的函数
+ },
+
+ // 是否同意协议
+ isAgree(e) {
+ let isAgree = null;
+ if (e.detail.value[0]) {
+ isAgree = true;
+ } else { isAgree = false;}
+
+ this.setData({
+ is_all_ok:isAgree,
+ });
+ },
+
+ }
+
+})
+
diff --git a/components/privacy_pop/privacy_pop.json b/components/privacy_pop/privacy_pop.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/components/privacy_pop/privacy_pop.json
@@ -0,0 +1,4 @@
+{
+ "component": true,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/components/privacy_pop/privacy_pop.wxml b/components/privacy_pop/privacy_pop.wxml
new file mode 100644
index 0000000..46ead44
--- /dev/null
+++ b/components/privacy_pop/privacy_pop.wxml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+ 用户服务协议与隐私政策
+
+
+
+ 您好，为了向您提供更优质的服务，在您使用本小程序服务前，请认真阅读《用户服务协议》和《隐私政策》条款，我们需要在征得您的同意后依法收集并使用相关信息，包括：我们会在您开启位置权限后访问获取您的位置信息，根据您的位置信息提供更契合您需求的页面展示及服务，如推荐距离您最近的售卖门店。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/privacy_pop/privacy_pop.wxss b/components/privacy_pop/privacy_pop.wxss
new file mode 100644
index 0000000..c4230c4
--- /dev/null
+++ b/components/privacy_pop/privacy_pop.wxss
@@ -0,0 +1,27 @@
+@import '../../app.wxss';
+.privacy_view{
+ position: fixed; z-index: 220000; background-color: #fff;
+ left:50%;top: 50%;border-radius: 10rpx;
+ width: 640rpx;margin-left: -320rpx;
+ height:780rpx;margin-top: -380rpx;
+}
+.pri_title{
+ color:#333;text-align: center;font-size: 30rpx; margin: 20rpx 0;
+}
+.pri_content{
+ border: 1rpx solid #eee; color:#666; height: 430rpx;width: 600rpx; margin: 0 auto; font-size: 26rpx;
+}
+.pri_content_p{ width: 560rpx;display: block; margin-top: 20rpx;margin-left: 20rpx; line-height: 48rpx;letter-spacing:5rpx }
+.pri_btn{width: 600rpx; margin: 0 auto;margin-top: 30rpx}
+.gray {color: #767f8e;}
+.continue_btn{
+ width: 600rpx;
+ height: 94rpx;
+ line-height: 94rpx;
+ background-color: #f23030;
+ border-radius: 48rpx;
+ color: rgb(255,255,255);
+ font-size: 32rpx;
+ margin-top: 40rpx;
+}
+
diff --git a/packageA/pages/chongzhiDetails/chongzhiDetails.js b/packageA/pages/chongzhiDetails/chongzhiDetails.js
index 05ae07f..481ed6a 100644
--- a/packageA/pages/chongzhiDetails/chongzhiDetails.js
+++ b/packageA/pages/chongzhiDetails/chongzhiDetails.js
@@ -23,7 +23,8 @@ Page({
*/
onLoad: function (options) {
- const self = this;
+ wx.showLoading();
+ const self = this;
if(options.type)
self.setData({type:options.type});
@@ -50,11 +51,11 @@ Page({
getApp().request.promiseGet("/api/weshop/ad/page",{
- data:{store_id:os.stoid,enabled:1,pid:601}
+ data:{store_id:os.stoid,enabled:1,pid:1210}
}).then(res=>{
if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){
var a = res.data.data.pageData;
- self.setData({show_img:a[0].ad_code,ad_color:a[0].bgcolor});
+ self.setData({show_img:a[0].ad_code,ad_color:a[0].bgcolor,ad:a[0] });
}
})
@@ -94,7 +95,9 @@ Page({
self.setData({
result: result,
});
-
+
+ wx.hideLoading();
+
},
});
@@ -276,4 +279,12 @@ Page({
}
})
},
+
+
+ go_url:function (e){
+ var url=e.currentTarget.dataset.url;
+ if(url){
+ getApp().goto(url);
+ }
+ }
})
\ No newline at end of file
diff --git a/packageA/pages/chongzhiDetails/chongzhiDetails.wxml b/packageA/pages/chongzhiDetails/chongzhiDetails.wxml
index 055d1fe..3b92c0e 100644
--- a/packageA/pages/chongzhiDetails/chongzhiDetails.wxml
+++ b/packageA/pages/chongzhiDetails/chongzhiDetails.wxml
@@ -3,16 +3,30 @@
-
-
-
-
-
- 女王专享
- 你的美丽我来缔造
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 女王专享
+ 你的美丽我来缔造
+
+
+
+
diff --git a/packageA/pages/chongzhiDetails/g_filter.wxs b/packageA/pages/chongzhiDetails/g_filter.wxs
index f9bd741..f924278 100644
--- a/packageA/pages/chongzhiDetails/g_filter.wxs
+++ b/packageA/pages/chongzhiDetails/g_filter.wxs
@@ -6,6 +6,11 @@ var is_acting = function(endtime){
var bijiao = getDate(endtime) - getDate();
return bijiao > 0 ? true : false;
}
+var has_char=function(url,key){
+ if(!url) return -1;
+ return url.indexOf(key);
+}
module.exports = {
- is_acting:is_acting
+ is_acting:is_acting,
+ has_char:has_char,
}
\ No newline at end of file
diff --git a/packageA/pages/distribution/myteam/myteam.js b/packageA/pages/distribution/myteam/myteam.js
index c664b1a..0532b3b 100644
--- a/packageA/pages/distribution/myteam/myteam.js
+++ b/packageA/pages/distribution/myteam/myteam.js
@@ -8,7 +8,7 @@ Page({
* 页面的初始数据
*/
data: {
- tabArr: ['一级分销','二级分销'],//'分销'
+ tabArr: ['一级分销'],//'分销'
currentTabIndex: 0, //记录当前点击的Tab索引
list: null,
@@ -35,9 +35,17 @@ Page({
app.request.promiseGet('/api/weshop/storeDistribut/get/'+app.globalData.setting.stoid,{
}).then(res=>{
if(res.data.code==0 && res.data.data){
- if(res.data.data.firstName) self.data.tabArr[0]=res.data.data.firstName;
- if(res.data.data.secondName) self.data.tabArr[1]=res.data.data.secondName;
- self.setData({tabArr:self.data.tabArr})
+ if(res.data.data.is_shshow==0)
+ {
+ self.setData({tabArr:['一级分销','二级分销']})
+ }
+
+ if(res.data.data.firstName) self.data.tabArr[0]=res.data.data.firstName;
+ if(res.data.data.is_shshow==0)
+ {
+ if(res.data.data.secondName) self.data.tabArr[1]=res.data.data.secondName;
+ }
+ self.setData({tabArr:self.data.tabArr})
}
})
},
diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index f25da78..4cb8a4c 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -560,6 +560,12 @@ Page({
// gid 在onload阶段已经保存在this.data中
onShow: function() {
+ //-- 看一下隐私政策要不要显示 --
+ var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
+ if (privacy_pop) {
+ privacy_pop.check_pri_show();
+ }
+
getApp().check_can_share();
var that=this;var th=this;
@@ -4047,22 +4053,43 @@ Page({
hiddenCS: true,
});
},
-
-
-
-
-
-
-
-
-
+ //-- 弹出框的同意的优化,重新获取定位 ---
+ agree_pri:function (){
+ var th=this;
+ var bconfig = th.data.bconfig;
+ if (bconfig && bconfig.is_sort_storage) {
+ wx.getLocation({
+ type: 'gcj02',
+ success: function (res) {
+
+ th.data.lat = res.latitude;
+ th.data.lon = res.longitude;
+ th.data.is_get_local_ok = 1;
+ th.setData({is_gps: 1});
+ th.get_sto();
+ },
+ fail: function (res) {
+ th.data.is_get_local_ok = 1;
+ th.get_sto();
+ if (res.errCode == 2) {
+ th.setData({is_gps: 0});
+ if (th.data.is_gps == 0) {
+ getApp().confirmBox("请开启GPS定位", null, 25000, !1);
+ }
+ } else {
+ th.setData({is_gps: "3"});
+ }
+
+ }
+ })
+ }
+ },
+
-
-
});
diff --git a/packageA/pages/goodsInfo/goodsInfo.json b/packageA/pages/goodsInfo/goodsInfo.json
index d201627..4d70c35 100644
--- a/packageA/pages/goodsInfo/goodsInfo.json
+++ b/packageA/pages/goodsInfo/goodsInfo.json
@@ -4,6 +4,7 @@
"usingComponents": {
"nav_box": "/components/nav_box/nav_box",
"warn": "/components/long_warn/long_warn",
- "serviceCard_recommend": "/components/serviceCard_list/serviceCard_list"
+ "serviceCard_recommend": "/components/serviceCard_list/serviceCard_list",
+ "privacy_pop": "/components/privacy_pop/privacy_pop"
}
}
\ No newline at end of file
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index 431ccb4..d0aa400 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -3,6 +3,9 @@
+
+
+
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
index 0ebda43..5778cf0 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
@@ -554,6 +554,12 @@ Page({
// gid 在onload阶段已经保存在this.data中
onShow: function () {
+ //-- 看一下隐私政策要不要显示 --
+ var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
+ if (privacy_pop) {
+ privacy_pop.check_pri_show();
+ }
+
getApp().check_can_share(this);
var that = this;
var ee = this, gid = this.data.gid, i = getApp().request;
@@ -3885,6 +3891,38 @@ Page({
getApp().goto(url);
},
+ //-- 弹出框的同意的优化,重新获取定位 ---
+ agree_pri:function (){
+ var th=this;
+ var bconfig = th.data.bconfig;
+ if (bconfig && bconfig.is_sort_storage) {
+ wx.getLocation({
+ type: 'gcj02',
+ success: function(res) {
+
+ th.data.lat = res.latitude;
+ th.data.lon = res.longitude;
+ th.data.is_get_local_ok = 1;
+ th.setData({ is_gps: 1 });
+ th.get_sto();
+ },
+ fail: function(res) {
+
+ th.data.is_get_local_ok = 1;
+ th.get_sto();
+ if (res.errCode == 2) {
+ th.setData({is_gps: 0});
+ if (th.data.is_gps == 0) {
+ getApp().confirmBox("请开启GPS定位", null, 25000, !1);
+ }
+ } else {
+ th.setData({ is_gps: "3" });
+ }
+
+ }
+ })
+ }
+ },
});
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json
index ffdfeb2..b1f6157 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json
@@ -5,6 +5,7 @@
"nav_box": "/components/nav_box/nav_box",
"warn": "/components/long_warn/long_warn",
"serviceCard_recommend": "/components/serviceCard_list/serviceCard_list",
- "share": "/components/share/share"
+ "share": "/components/share/share",
+ "privacy_pop": "/components/privacy_pop/privacy_pop"
}
}
\ 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 4e33079..5c2e02c 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
@@ -3,6 +3,9 @@
+
+
+
diff --git a/packageA/pages/serviceCard_pd/team_show/team_show.js b/packageA/pages/serviceCard_pd/team_show/team_show.js
index e2f1254..84d9943 100644
--- a/packageA/pages/serviceCard_pd/team_show/team_show.js
+++ b/packageA/pages/serviceCard_pd/team_show/team_show.js
@@ -140,7 +140,13 @@ Page({
//显示加载
onShow:function(){
- getApp().check_can_share();
+ //-- 看一下隐私政策要不要显示 --
+ var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
+ if (privacy_pop) {
+ privacy_pop.check_pri_show();
+ }
+
+ getApp().check_can_share();
var tg_id = this.data.tg_id,th=this;
this.init(tg_id);
},
@@ -1615,7 +1621,46 @@ Page({
go_to:function (e) {
var url=e.currentTarget.dataset.url;
getApp().goto(url);
- }
+ },
+
+ //-- 弹出框的同意的优化,重新获取定位 ---
+ agree_pri:function (){
+ var th=this;
+ var bconfig = th.data.bconfig;
+ if (bconfig && bconfig.is_sort_storage) {
+ wx.getLocation({
+ type: 'gcj02',
+ success: function (res) {
+ th.data.lat = res.latitude;
+ th.data.lon = res.longitude;
+ th.data.is_get_local_ok = 1;
+ th.setData({
+ is_gps: 1
+ });
+ //th.onShow();
+ th.get_sto();
+ },
+ fail: function (res) {
+ //th.onShow();
+ th.data.is_get_local_ok = 1;
+ th.get_sto();
+ if (res.errCode == 2) {
+ th.setData({
+ is_gps: 0
+ });
+ if (th.data.is_gps == 0) {
+ getApp().confirmBox("请开启GPS定位", null, 25000, !1);
+ }
+ } else {
+ th.setData({
+ is_gps: "3"
+ });
+ }
+
+ }
+ })
+ }
+ },
diff --git a/packageA/pages/serviceCard_pd/team_show/team_show.json b/packageA/pages/serviceCard_pd/team_show/team_show.json
index 1f536c0..199474a 100644
--- a/packageA/pages/serviceCard_pd/team_show/team_show.json
+++ b/packageA/pages/serviceCard_pd/team_show/team_show.json
@@ -7,6 +7,7 @@
"backgroundColor": "#eeeeee"
},
"usingComponents": {
- "warn": "/components/long_warn/long_warn"
+ "warn": "/components/long_warn/long_warn",
+ "privacy_pop": "/components/privacy_pop/privacy_pop"
}
}
\ No newline at end of file
diff --git a/packageA/pages/serviceCard_pd/team_show/team_show.wxml b/packageA/pages/serviceCard_pd/team_show/team_show.wxml
index e473387..abb7500 100644
--- a/packageA/pages/serviceCard_pd/team_show/team_show.wxml
+++ b/packageA/pages/serviceCard_pd/team_show/team_show.wxml
@@ -1,3 +1,6 @@
+
+
+
@@ -11,13 +14,13 @@
- {{goods.serviceName}}
+ {{goods.serviceName}}
- ￥{{teamlist.price}}
+ ￥{{teamlist.price}}
零售价￥{{goods.show_price}}
@@ -62,7 +65,7 @@
- 团长
+ 团长
@@ -84,10 +87,10 @@
剩余
- {{obj.day}} :
- {{obj.hou}} :
- {{obj.min}} :
- {{obj.sec}} 结束
+ {{obj.day}} :
+ {{obj.hou}} :
+ {{obj.min}} :
+ {{obj.sec}} 结束
@@ -131,21 +134,21 @@
- 展开拼团列表
+ 展开拼团列表
-
+
- 收起拼团列表
+ 收起拼团列表
- {{item.nickname}}
+ {{item.nickname}}
{{item.add_time_date}} 开团
{{item.add_time_date}} 参团
@@ -157,7 +160,7 @@
- 大家都在团
+ 大家都在团
@@ -171,7 +174,7 @@
¥{{item.price}}
{{item.ct_num}}人
- 参团
+ 参团
@@ -194,7 +197,7 @@
{{goods.serviceName}}
- ¥{{teamlist.kttype==3?teamlist.yf_price:teamlist.price}}
+ ¥{{teamlist.kttype==3?teamlist.yf_price:teamlist.price}}
@@ -300,7 +303,7 @@
-
+
距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}}
@@ -360,7 +363,7 @@
-
+
距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}
@@ -377,7 +380,7 @@
确定
- 设为默认
+ 设为默认
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index 4d85d5a..13bacea 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -1,6 +1,7 @@
var t = require("../../../../utils/util.js"),
ut = t,
e = require("../../../../utils/common.js"),
+ common =e,
a = require("../../../../utils/wxParse/wxParse.js"),
s = getApp(),
i = s.request,
@@ -287,7 +288,7 @@ Page({
is_get_guide:0,
keyword:'', //门店搜索
sec_i:-1,//选中分类门店 下标
-
+ goodInfo_ad:"",//商品详情广告
adding:0 //避免重复点击
},
@@ -466,7 +467,10 @@ Page({
ee.init(gid);
//------几人评价-------
//n.init(th, "", "comments");
-
+ //商品详情广告----
+ a.wxParse("goodInfo_ad", "html", ut.format_content(e.goods_bottomconent), ee, 6);
+ common.wxParseAddFullImageUrl(ee, "goodInfo_ad");
+ //-------
th.requestCardNum(), wx.pageScrollTo && th.setData({
supportPageScroll: !0
});
@@ -898,6 +902,12 @@ Page({
//---展示---
onShow: async function () {
+ //-- 看一下隐私政策要不要显示 --
+ var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
+ if (privacy_pop) {
+ privacy_pop.check_pri_show();
+ }
+
//添加购物车的控制要清理0
this.data.adding=0;
@@ -3904,7 +3914,7 @@ Page({
var user_id = getApp().globalData.user_id;
if (!user_id) user_id = 0;
- if (prom_type == 3 || prom_type == 0 || prom_type == 2 || prom_type == 5 || prom_type == 7 || prom_type == 9) {
+ if (prom_type == 3 || prom_type == 0 || prom_type == 2 || prom_type == 5 || prom_type == 7) {
this.setData({
prom_type: 0, isshow: 1,
});
@@ -4068,6 +4078,10 @@ Page({
})
}
+ if(prom_type==9){
+ this.setData({ isshow: 1, });
+ }
+
// if (prom_type == 4) {
// //th.setData({is_integral_normal:1});
// var rdata = {
@@ -5117,7 +5131,7 @@ Page({
go_t_more: function () {
var team_id = this.data.prom_id;
wx.navigateTo({
- url: "/pages/team/team_more/team_more?team_id=" + team_id,
+ url: "/packageF/pages/team/team_more/team_more?team_id=" + team_id,
});
},
@@ -7346,7 +7360,40 @@ Page({
break;
}
}
- }
+ },
+
+ //-- 弹出框的同意的优化,重新获取定位 ---
+ agree_pri:function (){
+ var th=this;
+ var bconfig = th.data.bconfig;
+ if (bconfig && bconfig.is_sort_storage) {
+ wx.getLocation({
+ type: 'gcj02',
+ success: function(res) {
+
+ th.data.lat = res.latitude;
+ th.data.lon = res.longitude;
+ th.data.is_get_local_ok = 1;
+ th.setData({ is_gps: 1 });
+ th.get_sto();
+ },
+ fail: function(res) {
+
+ th.data.is_get_local_ok = 1;
+ th.get_sto();
+ if (res.errCode == 2) {
+ th.setData({is_gps: 0});
+ if (th.data.is_gps == 0) {
+ getApp().confirmBox("请开启GPS定位", null, 25000, !1);
+ }
+ } else {
+ th.setData({ is_gps: "3" });
+ }
+
+ }
+ })
+ }
+ },
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.json b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.json
index 53c58c3..58bee0f 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.json
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.json
@@ -5,6 +5,7 @@
"nav_box": "/components/nav_box/nav_box",
"warn": "/components/long_warn/long_warn",
"goods_recommend": "/components/goods_list/goods_list",
- "share": "/components/share/share"
+ "share": "/components/share/share",
+ "privacy_pop": "/components/privacy_pop/privacy_pop"
}
}
\ 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 f8fcb1c..5e00ddd 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -3,6 +3,8 @@
+
+
@@ -676,6 +678,10 @@
+
+
+
+
@@ -758,6 +764,10 @@
+
+
+
+
-->
diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js
index ffb3797..d4f53f3 100644
--- a/packageC/pages/presell/cart/cart.js
+++ b/packageC/pages/presell/cart/cart.js
@@ -895,7 +895,7 @@ Page({
if (o_condition1 < 0) o_condition1 = 0;
else if(o_condition1>th.data.goods.use_commission && th.data.bn_use_commission){
- o_condition1-=th.data.bn_use_commission;
+ o_condition1-=th.data.goods.use_commission;
}
th.setData({ exp_price: 0, order_m: o_condition1, show_submit: 1, })
@@ -905,7 +905,7 @@ Page({
if (o_condition < 0) o_condition = 0;
//if (o_condition1 < 0) o_condition1 = 0;
else if(o_condition>th.data.goods.use_commission && th.data.bn_use_commission){
- o_condition-=th.data.bn_use_commission;
+ o_condition-=th.data.goods.use_commission;
}
th.setData({ exp_price: 0, order_m: o_condition, show_submit: 1, })
@@ -2315,7 +2315,7 @@ Page({
}
if( th.data.bn_use_commission){
- the_price-=th.data.bn_use_commission;
+ the_price-=th.data.goods.use_commission;
}
th.setData({ exp_price: exp_price, order_m: the_price, show_submit: 1, })
@@ -2399,7 +2399,7 @@ Page({
}
if(th.data.bn_use_commission){
- the_price-=th.data.bn_use_commission;
+ the_price-=th.data.goods.use_commission;
}
th.setData({ exp_price: exp_price, order_m:the_price.toFixed(2), show_submit: 1, })
diff --git a/packageC/pages/presell/cart/cart.wxml b/packageC/pages/presell/cart/cart.wxml
index 7c5a4db..ba66a24 100644
--- a/packageC/pages/presell/cart/cart.wxml
+++ b/packageC/pages/presell/cart/cart.wxml
@@ -421,7 +421,7 @@
删除订单
重新退款
退款详情
+ url="/packageF/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js
index d6ef67f..c27d4f4 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.js
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -1,5 +1,6 @@
var ut = require("../../../../utils/util.js"),
e = require("../../../../utils/common.js"),
+ common = e,
a = require("../../../../utils/wxParse/wxParse.js"),
s = getApp(), app = s,
i = s.request,
@@ -259,6 +260,7 @@ Page({
is_retail_price: 0,
keyword:'', //门店搜索
sec_i:-1,//选中分类门店 下标
+ goodInfo_ad:'',//商品详情广告
},
//------初始化加载----------
@@ -400,6 +402,10 @@ Page({
appoint_pick_keyid: json_d.appoint_pick_keyid
});
+ //商品详情广告----
+ a.wxParse("goodInfo_ad", "html", ut.format_content(e.goods_bottomconent), ee, 6);
+ common.wxParseAddFullImageUrl(ee, "goodInfo_ad");
+ //-------
// ee.init(gid);
//------几人评价-------
//n.init(th, "", "comments");
@@ -703,6 +709,13 @@ Page({
//---展示---
onShow: function () {
+
+ //-- 看一下隐私政策要不要显示 --
+ var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
+ if (privacy_pop) {
+ privacy_pop.check_pri_show();
+ }
+
getApp().check_can_share(this);
var goods_list = null, th = this, that = this;
@@ -4821,4 +4834,48 @@ Page({
});
},
+ //-- 弹出框的同意的优化,重新获取定位 ---
+ agree_pri:function (){
+ var th=this;
+ var bconfig = th.data.bconfig;
+
+ if (bconfig && bconfig.is_sort_storage) {
+ wx.getLocation({
+ type: 'gcj02',
+ success: function (res) {
+
+ th.data.lat = res.latitude;
+ th.data.lon = res.longitude;
+ th.data.is_get_local_ok = 1;
+ th.setData({
+ is_gps: 1
+ });
+ //th.onShow();
+ th.get_sto();
+ },
+ fail: function (res) {
+ //th.onShow();
+ th.data.is_get_local_ok = 1;
+ th.get_sto();
+ if (res.errCode == 2) {
+ th.setData({
+ is_gps: 0
+ });
+ if (th.data.is_gps == 0) {
+ getApp().confirmBox("请开启GPS定位", null, 25000, !1);
+ }
+ } else {
+ th.setData({
+ is_gps: "3"
+ });
+ }
+
+ }
+ })
+ }
+
+
+ },
+
+
});
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.json b/packageC/pages/presell/goodsInfo/goodsInfo.json
index feb03a7..2bd588d 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.json
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.json
@@ -5,6 +5,7 @@
"nav_box": "/components/nav_box/nav_box",
"warn": "/components/long_warn/long_warn",
"goods_recommend": "/components/goods_list/goods_list",
- "share": "/components/share/share"
+ "share": "/components/share/share",
+ "privacy_pop": "/components/privacy_pop/privacy_pop"
}
}
\ No newline at end of file
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxml b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
index 47b3dcb..616f29c 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.wxml
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
@@ -3,6 +3,8 @@
+
+
@@ -338,6 +340,10 @@
+
+
+
+
@@ -427,6 +433,10 @@
+
+
+
+