diff --git a/app.js b/app.js
index a188f0a..7468cd6 100644
--- a/app.js
+++ b/app.js
@@ -113,9 +113,9 @@ App({
wx.getSystemInfo({
success: (res) => {
// console.log(res)
- let modelmes = res.model; //手机品牌
+ let modelmes = res?res.model:null; //手机品牌
console.log('手机品牌', modelmes)
- if (modelmes.indexOf('iPhone X') != -1) { //XS,XR,XS MAX均可以适配,因为indexOf()会将包含'iPhone X'的字段都查出来
+ if (modelmes && modelmes.indexOf('iPhone X') != -1) { //XS,XR,XS MAX均可以适配,因为indexOf()会将包含'iPhone X'的字段都查出来
this.globalData.isIpx = true
}
},
@@ -129,27 +129,36 @@ App({
th.promiseGet(turl,{}).then(res=>{
var o=res;
if(o.data.code==0){
- th.globalData.config2 = o.data.data;
+ th.globalData.config2 = o.data.data;
//有配置成要验证过期，因为过期的小程序没有办法审核
- if(th.globalData.config2.is_overdue){
-
+ if(th.globalData.config2 && th.globalData.config2.is_overdue){
+
//要开始验证，小程序有没有购买和过期
- if(!currentPage || currentPage.route.indexOf('error/error')==-1){
+ if(!currentPage || currentPage.route.indexOf('error/error')==-1 || currentPage.route.indexOf('index/index')==-1){
var tt=this.globalData.wxapp_buy_obj;
if (!tt){
this.get_isbuy(function (){
tt=th.globalData.wxapp_buy_obj;
if (tt.isout == 1){
th.promiseGet('/api/weshop/store/get/'+t.stoid,{}).then(res=>{
- wx.reLaunch({
- url: "/pages/error/error?msg=该商城已到期，暂停浏览！\r\n可联系:"+res.data.data.store_tel,
- });
+
+ if(!th.err_going){
+ wx.reLaunch({
+ url: "/pages/error/error?msg=该商城已到期，暂停浏览1！\r\n可联系:"+res.data.data.store_tel,
+ });
+ }
})
}
- else if (tt.isbuy == 0)
- wx.reLaunch({
- url: "/pages/error/error?msg=还未购买小程序",
- });
+ else if (tt.isbuy == 0){
+
+ if(!th.err_going){
+ wx.reLaunch({
+ url: "/pages/error/error?msg=还未购买小程序",
+ });
+ }
+
+ }
+
})
}
}
@@ -200,8 +209,13 @@ App({
}
},
//----------------获取配置参数--------------------
- getConfig: function(t, o) {
- var e = this; if(this.globalData.config==undefined) this.globalData.config=null;
+ getConfig: function(t, o) {
+ var e = this;
+ if(!e.globalData.setting.stoid){
+ t(null);
+ return false;
+ }
+ if(this.globalData.config==undefined) this.globalData.config=null;
this.globalData.config ? "function" == typeof t && t(this.globalData.config) : e.request.get("/api/weshop/store/get/" + e.globalData.setting.stoid, {
success: function(o) {
console.log('getConfig');
@@ -211,10 +225,13 @@ App({
}
});
},
-
//----------------获取配置参数--------------------
- getConfig2: function (t, o) {
+ getConfig2: function (t, o) {
var e = this;
+ if(!e.globalData.setting.stoid) {
+ t(null);
+ return false;
+ }
this.globalData.config2 && !o ?
"function" == typeof t && t(this.globalData.config2) : a.get("/api/weshop/storeconfig/get/" + e.globalData.setting.stoid, {
success: function (o) {
diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js
index 0183113..7ac451a 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.js
+++ b/components/diy_goodsGroup/diy_goodsGroup.js
@@ -75,9 +75,13 @@ Component({
}
// 在组件实例进入页面节点树时执行
- this.data.classstyle_id = nav_item.classstyle;
+ if(nav_item) {
+ this.data.classstyle_id = nav_item.classstyle;
+ this.data.wgroup =nav_item.wgroup;
+ }
+
this.data.goodscount = this.data.object.goodscount;
- this.data.wgroup =nav_item.wgroup;
+
var hei=280;
if(this.data.object.goodstit) hei+=80;
@@ -86,13 +90,13 @@ Component({
this.setData({swiper_hei:hei});
- if (nav_item.goodsclass == 1) {
+ if (nav_item && nav_item.goodsclass == 1) {
this.data.is_recommend = 1
}
- if (nav_item.goodsclass == 2) {
+ if (nav_item && nav_item.goodsclass == 2) {
this.data.is_hot = 1
}
- if (nav_item.goodsclass == 3) {
+ if (nav_item && nav_item.goodsclass == 3) {
this.data.is_new = 1
}
@@ -353,8 +357,9 @@ Component({
wx.showLoading();
var nav_item=this.data.object.nav_list[title_idx];
-
- this.data.g_id = this.data.object.nav_list[title_idx].data;
+ this.data.g_id =[];
+ if(this.data.object.nav_list && this.data.object.nav_list[title_idx] && this.data.object.nav_list[title_idx].data)
+ this.data.g_id=this.data.object.nav_list[title_idx].data;
var arr = [];
for (var i = 0; i < this.data.g_id.length; i += this.data.goodscount) {
arr.push(this.data.g_id.slice(i, i + this.data.goodscount));
@@ -364,18 +369,21 @@ Component({
this.data.requestData=[];
// 在组件实例进入页面节点树时执行
- this.data.classstyle_id = nav_item.classstyle;
- this.data.wgroup =nav_item.wgroup;
+ if(nav_item){
+ this.data.classstyle_id = nav_item.classstyle;
+ this.data.wgroup =nav_item.wgroup;
+ }
+
this.data.is_recommend = this.data.is_hot=this.data.is_new=0;
//推荐，热卖，新品
- if (nav_item.goodsclass == 1) {
+ if (nav_item && nav_item.goodsclass == 1) {
this.data.is_recommend = 1
}
- if (nav_item.goodsclass == 2) {
+ if (nav_item && nav_item.goodsclass == 2) {
this.data.is_hot = 1
}
- if (nav_item.goodsclass == 3) {
+ if (nav_item && nav_item.goodsclass == 3) {
this.data.is_new = 1
}
diff --git a/packageA/pages/cardDetails/cardDetails.wxml b/packageA/pages/cardDetails/cardDetails.wxml
index bd610df..a4b4469 100644
--- a/packageA/pages/cardDetails/cardDetails.wxml
+++ b/packageA/pages/cardDetails/cardDetails.wxml
@@ -17,3 +17,5 @@
{{details.serviceContent}}
+
+
diff --git a/packageA/pages/cardList/cardList.js b/packageA/pages/cardList/cardList.js
index 2a25c23..60c419c 100644
--- a/packageA/pages/cardList/cardList.js
+++ b/packageA/pages/cardList/cardList.js
@@ -61,6 +61,7 @@ Page({
isLogin: true,
});
+ currentQuery.page=1;
this.getData(true, url, currentQuery);
// app.request.promiseGet("/api/weshop/ad/page?pid=2&store_id=" + app.globalData.setting.stoid, {
// data: {
@@ -137,9 +138,7 @@ Page({
/**
* promiseGet请求数据
*/
- getData: function(isInit, url, data) {
- return new Promise(function(resolve, reject) {
-
+ getData: function(isInit, url, data,callback) {
app.request.promiseGet(url, {
data: data,
isShowLoading: true,
@@ -172,18 +171,18 @@ Page({
self.setData({
'list.pageData': []
});
- };
- resolve();
+ };
+ if(callback) callback();
+
})
.catch(function(err) {
console.log('出错拉！！！！',err);
self.setData({
'list.pageData': []
});
+
+ if(callback) callback();
});
-
- });
-
},
@@ -207,12 +206,9 @@ Page({
isLoading: true,
pageNum: this.data.pageNum + 1
});
- requestData.page = this.data.pageNum;
+ requestData.page = this.data.pageNum;
+ this.getData(false, url, requestData,callback)
- this.getData(false, url, requestData)
- .then(function() {
- callback();
- });
};
},
@@ -221,4 +217,12 @@ Page({
var url = "/packageA/pages/goodsInfo/goodsInfo?goods_id=" + gid;
app.goto(url);
},
+
+ //图片失败，默认图片
+ bind_bnerr: function(e) {
+ var _errImg = e.target.dataset.errorimg;
+ var _errObj = {};
+ _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
+ this.setData(_errObj); //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+ },
})
\ No newline at end of file
diff --git a/packageA/pages/cardList/cardList.json b/packageA/pages/cardList/cardList.json
index 477fbd1..2100451 100644
--- a/packageA/pages/cardList/cardList.json
+++ b/packageA/pages/cardList/cardList.json
@@ -3,6 +3,7 @@
"enablePullDownRefresh": false,
"usingComponents": {
"nodata": "/components/nodata/nodata",
- "advertising":"/components/diy_advertising/diy_advertising"
+ "advertising":"/components/diy_advertising/diy_advertising",
+ "nav_box":"/components/nav_box/nav_box"
}
}
\ No newline at end of file
diff --git a/packageA/pages/cardList/cardList.wxml b/packageA/pages/cardList/cardList.wxml
index 7e9254b..2f5d45a 100644
--- a/packageA/pages/cardList/cardList.wxml
+++ b/packageA/pages/cardList/cardList.wxml
@@ -1,6 +1,6 @@
+
-
@@ -9,12 +9,14 @@
-
+
{{item.serviceName}}
- 有效天数：{{item.validDays}}
+ 有效天数：{{item.validDays?item.validDays:0}}
{{item.money}}
@@ -24,20 +26,21 @@
-
-
+
-
+
-
+
+
{{item.serviceName}}
- 有效天数：{{item.validDays}}
+ 有效天数：{{item.validDays?item.validDays:0}}
{{item.money}}
@@ -47,9 +50,10 @@
-
+
- 已经到底了 -
+
@@ -61,12 +65,15 @@
-
+
{{item.serviceName}}
- 有效天数：{{item.validDays}}
+ 有效天数：{{item.validDays?item.validDays:0}}
{{item.money}}
@@ -81,4 +88,5 @@
- 已经到底了 -
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/packageA/pages/cardList/cardList.wxss b/packageA/pages/cardList/cardList.wxss
index a64bc81..168bec7 100644
--- a/packageA/pages/cardList/cardList.wxss
+++ b/packageA/pages/cardList/cardList.wxss
@@ -1,13 +1,10 @@
/* pages/i_service/cardList/cardList.wxss */
-page,
+page{ background-color: #f2f2f2;}
+
+
.page {
height: 100%;
}
-
-page {
- background-color: #f2f2f2;
-}
-
.scroll-view {
height: calc(100% - 300rpx);
}
@@ -69,9 +66,16 @@ page {
.list_item{ display: inline-block;}
.w100{ width: 100%;}
.w50{ width: 49%; }
-
+.w50.ml{margin-left: 12rpx;}
.w50 image{ width: 100%; height: 340rpx; }
.flex-set{display: flex;flex-wrap: wrap;}
-.ml{margin-left: 15rpx;}
-.b-bottom{ border-bottom:1rpx solid #fff}
\ No newline at end of file
+
+.b-bottom{ border-bottom:1rpx solid #fff}
+.bg_view{
+ display: block;
+ min-height: 100%;
+ width: 100%;
+ position: absolute;
+ left: 0;top: 0;z-index: 1;
+}
\ No newline at end of file
diff --git a/packageA/pages/cart2_ser/cart2_ser.js b/packageA/pages/cart2_ser/cart2_ser.js
index 201a766..fc0f10c 100644
--- a/packageA/pages/cart2_ser/cart2_ser.js
+++ b/packageA/pages/cart2_ser/cart2_ser.js
@@ -41,7 +41,11 @@ Page({
//判断页面是返回回来的还是 首次进入的
yuer:0,
},
- onLoad: function(t) {
+ onLoad: function(t) {
+ wx.setNavigationBarTitle({
+ title: "填写订单",
+ });
+
var appD=getApp().globalData.service_now;
this.data.postdata=appD;
this.data.param=t;
@@ -50,7 +54,7 @@ Page({
getApp().promiseGet("/api/wx/weappSendlist/page", {
data: {
store_id: os.stoid,
- typeid: "1002"
+ typeid: "1001"
}}).then(res=>{
if (res.data.code == 0 && res.data.data.pageData.length > 0) {
var template_id = res.data.data.pageData[0].template_id;
diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index 7260ba1..75fe01a 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -399,6 +399,7 @@ Page({
'data.goods_id': t.data.data.id,
'data.id': t.data.data.id,
'data.sales_sum': t.data.data.sales_sum,
+ 'data.storageId':t.data.data.storageId
});
@@ -803,7 +804,7 @@ Page({
if(sto_list){
for (var k = 0; k < e.data.data.pageData.length; k++) {
var it=e.data.data.pageData[k];
- if (sto_list.indexof(it.keyid)==-1) {
+ if (sto_list.indexOf(it.keyid)==-1) {
//删除
e.data.data.pageData.splice(k--, 1);
}
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index dd454e5..ba90b79 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -40,11 +40,9 @@
销量：{{data.sales_sum}}
- 有效天数：{{data.validDays}}
+ 有效天数：{{data.validDays?data.validDays:0}}
-
-
-
+
diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js
index f918a9e..f9a751b 100644
--- a/packageA/pages/profile/profile.js
+++ b/packageA/pages/profile/profile.js
@@ -141,8 +141,6 @@ Page({
}
},
-
-
//---点击二级之后的选择---
choose_for_store: function(e) {
var index_c = e.currentTarget.dataset.ind;
@@ -387,12 +385,7 @@ Page({
}
}
}, 200)
- //检验门店的点击，看下次数是不是到了
- // this.check_click_ok(function(){
-
-
- // },2)
-
+
},
//选择更多门店
@@ -532,10 +525,16 @@ Page({
self = this;
let url1 = '/api/weshop/storeconfig/get/';
- let url2 = '/api/weshop/prom/coupon/get/';
let url3 = '/api/weshop/users/getERPUser/';
url1 += r.stoid;
+ var user=app.globalData.userInfo;
+ if(!user) return false;
+ //-- 赋予默认值 --
+ if(user['idcard']) this.data.id=user['idcard'];
+ if(user['vipname']) this.data.name=user['vipname'];
+ if(user['address']) this.data.address=user['address'];
+
app.request.get(url1, {
success: function(res) {
console.log('x-->', res.data.code, res.data.data.reg_type, res.data.data.reg_info);
@@ -544,19 +543,11 @@ Page({
let reg_info = res.data.data.reg_info;
if(reg_type) { //reg_type为1才显示积分信息
if(reg_info) {
- reg_info = JSON.parse(reg_info);
- //获取优惠券
- url2 += reg_info.reginfo_coupon;
- app.request.get(url2, {
- success: function(r) {
- if(r.data.code == 0) {
- console.log('000res==>', r.data.data.name);
- self.setData({
- couponInfo: r.data.data.name,
- });
- };
- },
- });
+ reg_info = JSON.parse(reg_info);
+ if(reg_info.reginfo_coupon){
+ //判断有没有领过券
+ self.check_is_send_quan(reg_info.reginfo_coupon,user.user_id);
+ }
};
};
self.setData({
@@ -568,32 +559,76 @@ Page({
},
});
-
-
+
//获取默认信息
- url3 += r.stoid + "/" + app.globalData.user_id;
+ url3 += r.stoid + "/" +user.user_id;
app.request.get(url3, {
success: function(res) {
if(res.data.code == 0) {
console.log('url3', res.data.data.birthday);
let data = res.data.data;
- self.setData({
- isGender: data.sex,
- isLunar: data.islunar,
- datet: data.birthday,
- stoname: data.pickup_name,
- sto_sele_id: data.pickup_id,
- });
+
+ if(data.birthday){
+ data.birthday= ut.formar_no_full(data.birthday);
+ }
+
+ if(user['sex'] && !data.sex){
+ data.sex=user['sex'];
+ }
+ if(user['birthday'] && !data.birthday){
+ data.birthday= ut.formar_no_full(user['birthday']);
+ }
+
+ if(!data.pickup_name){
+ data.pickup_name="";
+ }
+ if(!data.pickup_id){
+ data.pickup_id=0;
+ }
+ //-- 获取门店 --
+ if(user['pickup_id'] && !data.pickup_id){
+ getApp().promiseGet("/api/weshop/pickup/get/"+r.stoid+"/"+user['pickup_id']).then(res=>{
+ if(res.data.code==0 && res.data.data){
+ data.pickup_name=res.data.data.pickup_name;
+ data.pickup_id=res.data.data.pickup_id;
+
+ self.setData({
+ isGender: data.sex,
+ isLunar: data.islunar,
+ datet: data.birthday,
+ stoname: data.pickup_name,
+ sto_sele_id: data.pickup_id,
+ });
+ }
+ else{
+ self.setData({
+ isGender: data.sex,
+ isLunar: data.islunar,
+ datet: data.birthday,
+ stoname: data.pickup_name,
+ sto_sele_id: data.pickup_id,
+ });
+ }
+ })
+ }else{
+ self.setData({
+ isGender: data.sex,
+ isLunar: data.islunar,
+ datet: data.birthday,
+ stoname: data.pickup_name,
+ sto_sele_id: data.pickup_id,
+ });
+ }
};
}
});
-
-
+
+ if(user){
+ self.setData({user:user})
+ }
+
},
-
-
-
-
+
onShow: function() {
var e = this;
if (this.data.is_zy) return false;
@@ -607,44 +642,7 @@ Page({
}
var req = t;
- // req.get("/api/weshop/users/getAndUpdateUser/" + r.stoid + "/" + getApp().globalData.user_id, {
- // success: function(src) {
- // var a = src.data.data;
-
- // if(!a) a={};
- // var time ="",birthday ="";
- // if(a && a.reg_time) time=util.formatTime(a.reg_time, "'Y/M/D");
- // if(a && a.birthday) birthday=util.formatTime(a.birthday, "'Y/M/D");
-
- // a.reg_time = time;
- // a.birthday = birthday
-
- // if(a.address=='null' || !a.address){
- // a.address="";
- // }
-
- // e.data.fir_guide_id=a.staffId;
- // if(choice_guide){
- // a.staffName=choice_guide.StaffName;
- // a.staffId=choice_guide.Id;
- // }
-
-
- // e.setData({
- // // phone: a.mobile,
- // user: a,
- // openid: a.openid,
- // sto_sele_id: a.pickup_id,
- // consumption: a.paypwd,
- // // identity_card: a.idcard,
- // address: a.address,
- // // isGender: a.sex,
- // // isstcsp: a.vipnopwd,
- // // iscalendar:a.islunar
- // });
-
- // }
- // })
+
a.getUserInfo(function(a) {
var txt = util.formatTime(a.birthday, 'yyyy-M-d'),
arr = txt.split(' ');
@@ -665,19 +663,41 @@ Page({
}
})
}
- // var phone = "";
- // phone+=a.mobile.substr(0, 3)+"****";
- // phone += a.mobile.substr(7, 12);
-
-
-
- // e.setData({
- // isGender:e.data.user.sex
- // })
+
}, !0);
},
-
+ check_is_send_quan:function(cid,uid){
+ var self=this;
+ let url2 = '/api/weshop/prom/coupon/get/';
+ //看一下会员有没有领过注册的券
+ getApp().promiseGet("/api/weshop/couponList/page",{
+ data:{store_id:r.stoid,uid:uid,cid:cid}
+ }).then(res=>{
+ var is_ling=0;
+ if(res.data.code==0 && res.data.data && res.data.data.total>0){
+ is_ling=1;
+ }
+
+ //没有领过券，就显示
+ if(!is_ling){
+ //获取优惠券
+ url2 += cid;
+ app.request.get(url2, {
+ success: function(r) {
+ if(r.data.code == 0) {
+ console.log('000res==>', r.data.data.name);
+ self.setData({
+ couponInfo: r.data.data.name,
+ });
+ };
+ },
+ });
+ }
+
+ })
+
+ },
//------卡片的显示和关闭--------
@@ -710,19 +730,6 @@ Page({
},
- //用户名字
- // user_name: function(e) {
- // var th = this;
- // var name = e.detail.value;
- // var vipname = 'user.vipname';
- // if (name != "" || name != null) {
- // th.setData({
- // [vipname]: name
- // });
- // }
-
- // },
-
//点击确认修改信息
confirm_revision: function() {
var th = this;
@@ -988,65 +995,94 @@ Page({
//保存
save: function() {
- var th = this;
- // let isAgree = this.data.isAgree;
- // 同意协议
- // if(isAgree) {
+ var th = this;
var sto_sele_id = this.data.sto_sele_id;
- let tjrname = this.data.referee;
- if (tjrname == "" || tjrname == null) {
- app.my_warnning("请输入推荐人", 0, this);
- return false;
- };
- let vipname = this.data.name;
- if (vipname == "" || vipname == null) {
- app.my_warnning("请输入姓名", 0, this);
- return false;
- };
- let sex = this.data.isGender;
- if (sex != "1" && sex != "2") {
- app.my_warnning("请选择性别", 0, this);
- return false;
- };
- let birthday = this.data.datet;
- if (birthday == "" || birthday == null) {
- app.my_warnning("请选择出生日期", 0, this);
- return false;
- };
- let idcard = this.data.id;
- if (idcard == "" || idcard == null) {
- app.my_warnning("请输入身份证号码", 0, this);
- return false;
- };
- let address = this.data.address;
- if (address == "" || address == null) {
- app.my_warnning("请输入地址", 0, this);
- return false;
- };
- let pickup_id = sto_sele_id;
- if (pickup_id == "" || pickup_id == null) {
- app.my_warnning("请输入地址", 0, this);
- return false;
+ var user=app.globalData.userInfo;
+
+ var data = {
+ store_id: r.stoid,
+ user_id: app.globalData.user_id,
};
+
+ //-- 需要推荐人 --
+ if(this.data.reg_info.introducer_state){
+ let tjrname = this.data.referee;
+ if (tjrname == "" || tjrname == null) {
+ app.my_warnning("请输入推荐人", 0, this);
+ return false;
+ };
+ if(tjrname==user.mobile || tjrname==user.erpvipno ){
+ app.my_warnning("推荐人不能是自己", 0, this);
+ return false;
+ }
+ data.tjrname=tjrname;
+ }
+
+ //-- 需要姓名 --
+ if(this.data.reg_info.name_state){
+ let vipname = this.data.name;
+ if (vipname == "" || vipname == null) {
+ app.my_warnning("请输入姓名", 0, this);
+ return false;
+ };
+ data.vipname=vipname;
+ }
+ //需要性别
+ if(this.data.reg_info.sex_state){
+ let sex = this.data.isGender;
+ if (sex != "1" && sex != "2") {
+ app.my_warnning("请选择性别", 0, this);
+ return false;
+ };
+ data.sex=sex;
+ }
+
+ //需要生日
+ if(this.data.reg_info.birthday_state){
+ let birthday = this.data.datet;
+ if (birthday == "" || birthday == null) {
+ app.my_warnning("请选择出生日期", 0, this);
+ return false;
+ };
+
+ data.birthday=birthday;
+ data.islunar=self.data.isLunar;
+ }
+
+ //-- 需要身份证 --
+ if(this.data.reg_info.idcard_state){
+ let idcard = this.data.id;
+ if (idcard == "" || idcard == null) {
+ app.my_warnning("请输入身份证号码", 0, this);
+ return false;
+ };
+ data.idcard=idcard;
+ }
+ //需要地址
+ if(this.data.reg_info.address_state){
+ let address = this.data.address;
+ if (address == "" || address == null) {
+ app.my_warnning("请输入地址", 0, this);
+ return false;
+ };
+ data.address=address;
+ }
+ //需要门店
+ if(this.data.reg_info.pick_state){
+ let pickup_id = sto_sele_id;
+ if (pickup_id == "" || pickup_id == null) {
+ app.my_warnning("请输入门店", 0, this);
+ return false;
+ };
+ data.pickup_id=sto_sele_id;
+ }
+
let isAgree = this.data.isAgree;
if(!isAgree) {
app.my_warnning("请您先阅读和勾选指定的内容", 0, this);
return false;
};
-
- var data = {
- store_id: r.stoid,
- user_id: app.globalData.user_id,
- tjrname: tjrname, //推荐人
- vipname: vipname, //名称
- sex: sex, //性别
- birthday: self.data.datet,
- islunar: self.data.isLunar,
- idcard: self.data.id,
- address: address,
- pickup_id: sto_sele_id ,//自提门店 所属门店
- };
-
+
console.log('data==>', data);
diff --git a/packageA/pages/profile/profile.wxml b/packageA/pages/profile/profile.wxml
index 83e9160..f42c7b3 100644
--- a/packageA/pages/profile/profile.wxml
+++ b/packageA/pages/profile/profile.wxml
@@ -24,21 +24,29 @@
-
+
+
+
推荐人:
-
- +{{reg_info.introducer}}积分
- +{{reg_info.introducer}}成长值
+
+
+
+ +{{reg_info.introducer}}积分
+ +{{reg_info.introducer}}成长值
+
-
-
- 姓名:
-
- +{{reg_info.name}}积分
- +{{reg_info.name}}成长值
+
+
+
+ 姓名:
+
+
+ +{{reg_info.name}}积分
+ +{{reg_info.name}}成长值
+
-
+
性别:
@@ -60,11 +68,14 @@
女
- +{{reg_info.sex}}积分
- +{{reg_info.sex}}成长值
+
+
+ +{{reg_info.sex}}积分
+ +{{reg_info.sex}}成长值
+
-
+
出生日期:
@@ -74,45 +85,52 @@
- {{datet? filters.format_time(datet):"请选择时间"}}∟
+ {{datet?datet:"请选择时间"}}∟
- +{{reg_info.birthday}}积分
- +{{reg_info.birthday}}成长值
+
+
+ +{{reg_info.birthday}}积分
+ +{{reg_info.birthday}}成长值
+
- 身份证:
-
+ 身份证:
+
+
+{{reg_info.idcard}}积分
+{{reg_info.idcard}}成长值
+
地址:
-
- +{{reg_info.address}}积分
- +{{reg_info.address}}成长值
+
+
+ +{{reg_info.address}}积分
+ +{{reg_info.address}}成长值
+
-
-
-
-
+
所属门店:
- {{stoname}}
+ {{stoname?stoname:'请选择门店'}}
∟
+
+
+{{reg_info.pick}}积分
+{{reg_info.pick}}成长值
+
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 09cb9fe..9b49260 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -783,7 +783,7 @@ Page({
isShowLoading: 0,
success: function(res_d) {
- if(res_d.data.code==0){
+ if(res_d.data.code==0 && res_d.data.data){
if (t.goods_num > store_count) {
wx.showModal({
title: '提示',
@@ -1331,10 +1331,9 @@ Page({
});
},
//跳到首页
- goto: function(e) {
- navigateTo({
- url: '/pages/index/index/index',
- })
+ goto: function(e) {
+ var url='/pages/index/index/index';
+ getApp().goto(url);
},
//---加载更多是靠这个函数----
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index fbedc65..bb1c73e 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -671,7 +671,7 @@ Page({
ob.buynum=num;
ob.weight=data.gift_weight; //商品的重量
ob.exp_sum_type=data.gift_exp_sum_type; //商品的物流计算方式
- ob.uniform_exp_sum=data.uniform_exp_sum //统一运费的金额
+ ob.uniform_exp_sum=data.gift_uniform_exp_sum //统一运费的金额
th.setData({buy_now_gift_goods:ob});
}
@@ -1541,7 +1541,8 @@ Page({
//如果有赠品的时候，也要计算赠品的物流费用
if(th.data.buy_now_gift_goods){
- shipping_price=th.get_now_gift_goods_wuliu(code, o_shipping_price, th.data.user_addr, gift_freight_free, parseFloat(allpice)-cut_price-quan_price, rs,shipping_price,no_by_data);
+ shipping_price=th.get_now_gift_goods_wuliu(code, o_shipping_price, th.data.user_addr, gift_freight_free,
+ parseFloat(allpice)-cut_price-quan_price, rs,shipping_price,no_by_data,goods_weight,goods_piece);
}
if(shipping_price<=0){
@@ -3161,7 +3162,7 @@ Page({
arr.gift_original_img = get_data.goodsinfo.original_img;
arr.gift_weight = get_data.goodsinfo.weight;
arr.gift_exp_sum_type = get_data.goodsinfo.exp_sum_type;
- arr.uniform_exp_sum = get_data.goodsinfo.uniform_exp_sum;
+ arr.gift_uniform_exp_sum = get_data.goodsinfo.uniform_exp_sum;
arr.gift_limit_num = get_data.limit_num;
arr.gift_storecount = get_data.gift_storecount;
}
@@ -3239,7 +3240,7 @@ Page({
},
//计算立即购买赠品的物流费用
- get_now_gift_goods_wuliu:function (code, o_shipping_price, user_addr, gift_freight_free,allpice, rs,shipping_price,no_by_data) {
+ get_now_gift_goods_wuliu:function (code, o_shipping_price, user_addr, gift_freight_free,allpice, rs,shipping_price,no_by_data,goods_weight1,goods_piece1) {
var good=this.data.buy_now_gift_goods;
var goods_weight=-1, goods_piece=-1;
var gift_shipping_price=0;
@@ -3247,17 +3248,28 @@ Page({
switch (good['exp_sum_type']) {
case 1:
//统一运费
- gift_shipping_price += good['uniform_exp_sum']; break;
+ gift_shipping_price += good['uniform_exp_sum'];
+ gift_shipping_price+=o_shipping_price;
+ break;
case 2:
if (goods_weight < 0) goods_weight = 0;
//累积商品重量 每种商品的重量 * 数量
- goods_weight += good['weight'] * good['buynum'];break;
+ goods_weight += good['weight'] * good['buynum'];
+ if(goods_weight1>0){
+ goods_weight+=goods_weight1;
+ }
+ break;
case 3:
if (goods_piece < 0) goods_piece = 0;
//累积商品数量
- goods_piece += good['buynum']; break;
+ goods_piece += good['buynum'];
+ if(goods_piece1){
+ goods_piece+=goods_piece1;
+ }
+ break;
}
-
+
+
//如果有设置不包邮区域的时候
if(no_by_data && no_by_data.region_list){
if(th.check_by_area(no_by_data.region_list)){
@@ -3272,10 +3284,11 @@ Page({
//th.data.is_no_by[th.data.bn_pick]=1;
}
}
+
var t_shipping_price=
this.calculatewuliu(code, gift_shipping_price, goods_weight,
goods_piece, user_addr, gift_freight_free, allpice, rs);
- return t_shipping_price+shipping_price;
+ return t_shipping_price;
},
diff --git a/pages/error/error.js b/pages/error/error.js
index 5f0b0b5..7129986 100644
--- a/pages/error/error.js
+++ b/pages/error/error.js
@@ -6,7 +6,8 @@ Page({
msg:"",
},
- onLoad:function(t){
+ onLoad:function(t){
+ getApp().err_going=1;
var th=this,app = getApp();
app.getConfig(function(e){
th.setData({ store:e,msg:t.msg});
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index b407211..fd5a67f 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -1587,11 +1587,10 @@ Page({
th.setData({goodsInputNum:redis_num})
return false;
}
-
}
-
var e = th.data.sele_g.store_count;
- if(th.data.sales_rules==2){
+ var p_type=th.data.prom_type; //&& p_type!=1 && p_type!=4
+ if(th.data.sales_rules==2 && (p_type!=1 && p_type!=4 && p_type!=6 || th.data.openSpecModal_inte_normal==1 || th.data.is_normal== 1) ){
if(!th.data.def_pick_store){
wx.showModal({ title: '请选择门店', });
return false;
@@ -1599,7 +1598,7 @@ Page({
e=th.data.def_pick_store.CanOutQty;
}
}
-
+ if(!e) e=0;
//库存不足，不增加
if(e{
+ //判断是不是有全屏广告
+ if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){
+ th.setData({
+ is_full_screen_show:1,
+ full_ad:res.data.data.pageData[0],
+ })
+ //--定时关闭--
+ th.data.full_screen=setInterval(function(){
+ if(!th.data.sec_show) {
+ clearInterval(th.data.full_screen);
+ th.close_full_screen();
+ return false;
+ }
+ th.data.sec_show--;
+ th.setData({sec_show:th.data.sec_show});
+ },1000)
+ }
+ })
+ }
+}
\ No newline at end of file
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 4fcd618..3032a36 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -15,6 +15,7 @@ var regeneratorRuntime = require('../../../utils/runtime.js');
var api = require('../../../api/api.js');
var d = getApp().globalData;
+var full_screen = require('full_screen.js');
Page({
data: {
@@ -75,18 +76,82 @@ Page({
showHongbao: false,
showHongbaoSmall: false,
-
+
+ is_full_screen_show:0, //全屏显示
+ sec_show:3, //倒计时的秒数
+ full_ad:null, //全屏广告
+ full_screen:0, //全屏广告
+
},
onLoad: async function(tt) {
console.log("进入首页-------------");
- console.log(tt);
-
+ console.log(tt);
var th = this;
var first_leader=tt.first_leader;
if(!first_leader && tt.scene){
first_leader= decodeURIComponent(tt.scene);
}
+
+ getApp().getConfig(function(e){
+ //--首页的问题--
+ if (getApp().globalData.config && getApp().globalData.config.store_name != undefined && getApp().globalData.config.store_name != null) {
+ wx.setNavigationBarTitle({
+ title: getApp().globalData.config.store_name,
+ });
+ } else {
+ wx.setNavigationBarTitle({
+ title: getApp().globalData.setting.appName,
+ });
+ };
+ });
+
+
+ var th = this;
+
+ getApp().getConfig2(function(config2){
+ if(config2 && config2.is_overdue==1){
+ getApp().promiseGet("/store/storemoduleendtime/page?store_id=" +os.stoid + "&type=5",{}).then(res=>{
+ var o=res;
+ if (o.data.code == 0) {
+ var ob = { isout: 0, isbuy: 1 };
+ var arr = o.data.data.pageData;
+ var isbuy = 0;
+ //----如果数组不为空----
+ if (arr.length > 0) {
+ arr.forEach(function (val, ind) {
+ if (val.is_sy == 0 && val.type == 5) {
+ isbuy = 1;
+ var now = ut.gettimestamp();
+ if (now > val.end_time) ob.isout = 1;
+ return false;
+ }
+ })
+ }
+ ob.isbuy = isbuy;
+
+ var pages = getCurrentPages(); //获取加载的页面
+ var currentPage = pages[pages.length - 1]; //获取当前页面的对象
+
+ console.log("当前路由");
+ console.log(currentPage.route);
+
+
+ th.setappdata(ob);
+
+ if(ob.isbuy && !ob.isout){
+ th.onload_init();
+ }
+ }else{
+ th.onload_init();
+ }
+ })
+ }
+
+ else{
+ th.onload_init();
+ }
+ })
if(first_leader){
//-- user_id代过来免登录 --
@@ -97,7 +162,7 @@ Page({
getApp().globalData.guide_id=res.data.data.id;
}
})
- }
+ }
// 判断是否有红包活动
getApp().request.promiseGet('/api/weshop/redmoney/redConfig/get/'+getApp().globalData.setting.stoid, {
@@ -144,72 +209,74 @@ Page({
//getApp().globalData.url=th.data.url
//t.editTabBar(th,o.stoid,th.data.url);
- await this.init_load();
-
-
- //显示的时候要开启计时器
- this.data.is_timer = 1;
- //如果是自定义模板
- if (this.data.isTemplate) {
- //---先获取会员---
- t.getUserFir(function() {
- th.is_festival();
- var new_nav = th.data.new_nav;
- if (new_nav == "") {
- th.is_new();
- }
- setTimeout(function () {
- if (getApp().globalData.user_id) getApp().requestCardNum(th);
- },500)
-
- });
- } else {
- await this.init_fir();
- wx.setNavigationBarColor({
- frontColor: '#ffffff', // 必写项
- backgroundColor: '#ff7295', // 必写项
- })
- }
-
- //--正再拼团中的处理--
- var url = "/api/weshop/order/pageTuan?pt_status=2&is_pt=1&store_id=" + os.stoid + "&pageSize=6&page=1"
- await getApp().request.promiseGet(url, {}).then(res => {
- if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
- th.data.pt_timer_arr = res.data.data.pageData;
- }
- })
- if (th.data.pt_timer_arr && th.data.pt_timer_arr.length > 0) {
- for (var i in th.data.pt_timer_arr) {
- var p_item = th.data.pt_timer_arr[i];
- await getApp().request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + p_item.user_id, {
- 1: 1
- }).then(res => {
- th.data.pt_timer_arr[i].head_pic = res.data.data.head_pic;
- th.data.pt_timer_arr[i].nickname = res.data.data.nickname;
- })
- }
- th.Interval_pt();
- }
-
- //---处理正在6个分类----
- await getApp().request.promiseGet("/api/weshop/goodscategory/page", {
- data: {
- store_id: os.stoid,
- pageSize: 5,
- is_show: 1,
- level:1
- }
- }).then(res => {
- if (res.data.data) {
- var gd_category = res.data.data.pageData;
- th.setData({
- gd_category: gd_category
- });
- }
- })
-
-
},
+
+ async onload_init(){
+ var th=this;
+ await this.init_load();
+ //显示的时候要开启计时器
+ this.data.is_timer = 1;
+ //如果是自定义模板
+ if (this.data.isTemplate) {
+ //---先获取会员---
+ t.getUserFir(function() {
+ th.is_festival();
+ var new_nav = th.data.new_nav;
+ if (new_nav == "") {
+ th.is_new();
+ }
+ setTimeout(function () {
+ if (getApp().globalData.user_id) getApp().requestCardNum(th);
+ },500)
+
+ });
+ } else {
+ await this.init_fir();
+ wx.setNavigationBarColor({
+ frontColor: '#ffffff', // 必写项
+ backgroundColor: '#ff7295', // 必写项
+ })
+ }
+
+ //--正再拼团中的处理--
+ var url = "/api/weshop/order/pageTuan?pt_status=2&is_pt=1&store_id=" + os.stoid + "&pageSize=6&page=1"
+ await getApp().request.promiseGet(url, {}).then(res => {
+ if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
+ th.data.pt_timer_arr = res.data.data.pageData;
+ }
+ })
+ if (th.data.pt_timer_arr && th.data.pt_timer_arr.length > 0) {
+ for (var i in th.data.pt_timer_arr) {
+ var p_item = th.data.pt_timer_arr[i];
+ await getApp().request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + p_item.user_id, {
+ 1: 1
+ }).then(res => {
+ th.data.pt_timer_arr[i].head_pic = res.data.data.head_pic;
+ th.data.pt_timer_arr[i].nickname = res.data.data.nickname;
+ })
+ }
+ th.Interval_pt();
+ }
+
+ //---处理正在6个分类----
+ await getApp().request.promiseGet("/api/weshop/goodscategory/page", {
+ data: {
+ store_id: os.stoid,
+ pageSize: 5,
+ is_show: 1,
+ level:1
+ }
+ }).then(res => {
+ if (res.data.data) {
+ var gd_category = res.data.data.pageData;
+ th.setData({
+ gd_category: gd_category
+ });
+ }
+ })
+ },
+
+
//关闭新用户领取广告
close_disgraceful: function() {
var th = this;
@@ -255,9 +322,8 @@ Page({
if(!userInfo || !userInfo.user_id) userInfo=null;
//有加载过一次首页，就显示
if(show || userInfo || getApp().globalData.user_id){
- setTimeout(function(){
- var full_screen = th.selectComponent("#full_screen"); //组件的id
- full_screen.get_the_full_screen();
+ setTimeout(function(){
+ full_screen.get_the_full_screen(th);
},800)
//动画效果
if(!th.data.f_hidden){
@@ -282,25 +348,18 @@ Page({
this.data.is_timer = 0;
clearInterval(this.data.pt_timer);
clearInterval(this.data.w_holiday_pop);
+ clearInterval(this.data.full_screen);
+
this.data.w_holiday_pop=0;
for(var i = 1; i < 100; i++) {
clearInterval(i);
}
-
},
//同步初始加载
async init_load() {
- await getApp().getConfig_ays();
- var th = this;
- if(getApp().globalData.config2.is_overdue==1){
- await getApp().get_isbuy();
- this.setappdata(getApp().globalData.wxapp_buy_obj);
- }
-
-
-
+ var th=this;
//因为营销版本的功能包含了自定义模板的功能，是同时的
//读取全局是否有弄自定义模板
await api.get_template_fir(o.stoid).then(res => {
@@ -327,16 +386,7 @@ Page({
- //--首页的问题--
- if (getApp().globalData.config && getApp().globalData.config.store_name != undefined && getApp().globalData.config.store_name != null) {
- wx.setNavigationBarTitle({
- title: getApp().globalData.config.store_name,
- });
- } else {
- wx.setNavigationBarTitle({
- title: getApp().globalData.setting.appName,
- });
- };
+
@@ -1005,5 +1055,17 @@ Page({
showHongbaoSmall: true, //显示抢红包小图标
});
},
+
+ /*-- 全屏广告 --*/
+ close_full_screen(){
+ this.setData({is_full_screen_show:0,sec_show:0});
+ },
+ //-- 跳转到满屏广告的链接 --
+ go_full_ad(){
+ if(!this.data.full_ad) return false;
+ if(!this.data.full_ad.ad_weapplink) return false;
+ getApp().goto(this.data.full_ad.ad_weapplink);
+ this.close_full_screen();
+ },
});
\ No newline at end of file
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index fcec284..d4e3957 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -1,5 +1,11 @@
-
+
+
+
+
+ 跳过 {{sec_show}}
+
+
@@ -106,14 +112,12 @@
-
-
-
-
+
-
+
{{item.name}}
diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss
index b28ea57..2ed7fee 100644
--- a/pages/index/index/index.wxss
+++ b/pages/index/index/index.wxss
@@ -977,3 +977,9 @@ page {
background-size: 100% 100%;
background-repeat: no-repeat;
}
+.skip_box{
+ float: right; margin-top: 10rpx; margin-right: 10rpx;
+ background-color: gainsboro; width: 120rpx;
+ height: 48rpx; font-size: 28rpx; line-height: 48rpx;
+ text-align: center; border-radius: 20rpx;
+ }
diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js
index 0b4cbdb..c8af4a1 100644
--- a/pages/team/team_show/team_show.js
+++ b/pages/team/team_show/team_show.js
@@ -721,11 +721,12 @@ Page({
go_pay:function () {
var th=this;
var def_pick_store=this.data.def_pick_store;
- if(def_pick_store) {
+ if(def_pick_store && def_pick_store.pickup_id) {
th.data.pick_id=def_pick_store.pickup_id; //选择门店
th.data.end_name=def_pick_store.pickup_name;
}
- if (th.data.pick_id == 0) return s.my_warnning("请选择门店", 0, th);
+ if (!th.data.pick_id) return s.my_warnning("请选择门店", 0, th);
+ if (th.data.pick_id==0) return s.my_warnning("请选择门店", 0, th);
//----判断起购数----
var qnum=parseFloat(th.data.teamlist.minbuynum);
diff --git a/pages/team/team_show/team_show.wxml b/pages/team/team_show/team_show.wxml
index 21e42ec..4f03bb6 100644
--- a/pages/team/team_show/team_show.wxml
+++ b/pages/team/team_show/team_show.wxml
@@ -215,26 +215,29 @@
-
+
{{def_pick_store.pickup_name}}
距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
-
- 更多门店
-
-
+
+
选择门店
+
+
+ 更多门店
+
+
(配送不匹配)
- 地址:5{{def_pick_store.fulladdress}}
+ 地址:{{def_pick_store.fulladdress}}
diff --git a/pages/togoin/togoin.js b/pages/togoin/togoin.js
index cf1e890..89be71a 100644
--- a/pages/togoin/togoin.js
+++ b/pages/togoin/togoin.js
@@ -13,6 +13,12 @@ Page({
config2:null,
},
onLoad: function (options) {
+ if (wx.getUserProfile) {
+ this.setData({
+ canIUseGetUserProfile: true
+ })
+ }
+
getApp().globalData.isLoad_ad=1;
//--判断是否有接受到邀请人的ID--
if(options.first_leader){
@@ -25,22 +31,20 @@ Page({
var logo=th.data.imghots+e.store_logo;
th.setData({ store: e,store_logo:logo});
})
-
+
+ //判断注册的条件
app.getConfig2(function (e) {
- if(e.reg_type==1){
- var need_go=0;
+ if(e.reg_type==1){
var arr=JSON.parse(e.reg_info);
- if(arr['name_state']==1) need_go=1;
- if(!need_go && arr['birthday_state']==1) need_go=1;
- if(!need_go && arr['idcard_state']==1) need_go=1;
- if(!need_go && arr['address_state']==1) need_go=1;
- if(!need_go && arr['pick_state']==1) need_go=1;
- if(!need_go && arr['sex_state']==1) need_go=1;
- if(!need_go && arr['introducer_state']==1) need_go=1;
- th.setData({need_go:1});
- }
-
- })
+ if(arr['name_state']==1) th.data.name_need_go=1;
+ if(arr['birthday_state']==1) th.data.birth_need_go=1;
+ if(arr['idcard_state']==1) th.data.idcard_need_go=1;
+ if(arr['address_state']==1) th.data.address_need_go=1;
+ if(arr['pick_state']==1) th.data.pick_need_go=1;
+ if(arr['sex_state']==1) th.data.sex_need_go=1;
+ if(arr['introducer_state']==1) th.data.introducer_need_go=1;
+ }
+ },1)
},
//绑定手机号
getphone:function (e) {
@@ -54,8 +58,7 @@ Page({
var th=this;
var sessionKey = getApp().globalData.sessionKey;
var openid = getApp().globalData.openid;
- var r=getApp().globalData.getu;
-
+ var r=getApp().globalData.getu;
th.save_the_data(r,e,sessionKey,openid)
},
@@ -108,6 +111,7 @@ Page({
});
}
})
+
})
},
@@ -179,14 +183,24 @@ Page({
} else {
return app.showWarning("授权登入失败！"+e.data.msg);
}
-
- wx.setStorageSync("userinfo",e.data.data);
+
+
+ var need_go=0;
+ var t_user=e.data.data;
+
+ wx.setStorageSync("userinfo",e.data.data);
wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(a.globalData.userInfo.head_pic);
- //如果有需要跳转，就跳转到.如果微信端有注册，就不需要跳转
- if(app.globalData.userInfo['openid']){
- th.data.need_go=0;
- }
- if(th.data.need_go){
+
+ //如果有需要完善的信息没有完善，就需要跳转
+ if(!t_user['vipname'] && th.data.name_need_go){ need_go=1;}
+ if(!t_user['birthday'] && th.data.birth_need_go){ need_go=1;}
+ if(!t_user['idcard'] && th.data.idcard_need_go){ need_go=1;}
+ if(!t_user['address'] && th.data.address_need_go){ need_go=1;}
+ if(!t_user['pickup_id'] && th.data.pick_need_go){ need_go=1;}
+ if(!t_user['sex'] && th.data.sex_need_go){ need_go=1;}
+ if(!t_user['fromuser_id'] && th.data.introducer_need_go){ need_go=1;}
+
+ if(need_go){
getApp().goto("/packageA/pages/profile/profile");
}else{
wx.navigateBack({ delta: 1})
@@ -207,7 +221,63 @@ Page({
var _errObj = {};
_errObj[_errImg] = this.data.imghots+"/miniapp/images/logo.png";
this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+ },
+
+ //-- 会员授权 --
+ bindUserInfo: function(ee) {
+ var that = this;
+ var user=ee.detail.userInfo;
+ //此处授权得到userInfo
+ getApp().globalData.getu = user;
+
+ //--拿下code--
+ wx.login({
+ success: function (o) {
+ var dd = {
+ js_code:o.code,
+ store_id: os.stoid,
+ nickname: app.clear_word(app.globalData.getu.nickName),
+ head_pic: app.clear_word(app.globalData.getu.avatarUrl)
+ };
+ //-- 导购会员ID --
+ if(getApp().globalData.guide_id){
+ dd.guide_id=getApp().globalData.guide_id;
+ }
+
+ getApp().request.get("/api/weshop/users/openidandkey", {
+ data: dd,
+ success: function (e) {
+ if(e.data.code==0){
+ that.setData({user:user})
+ //如果有会员的话,没有sessionKey
+ if(!e.data.data.sessionKey){
+ getApp().showWarning("登录成功");
+ getApp().globalData.userInfo=e.data.data;
+ getApp().globalData.user_id=e.data.data.user_id;
+ getApp().globalData.openid = e.data.data.weapp_openid;
+ //把会员的信息存在内存
+ wx.setStorageSync("userinfo",e.data.data);
+
+ setTimeout(function () {
+ wx.navigateBack({ delta: 1}) //返回上一页
+ },1000)
+ }else{
+ getApp().globalData.sessionKey=e.data.data.sessionKey;
+ getApp().globalData.openid=e.data.data.openid;
+ that.setData({show_bind:1});
+ }
+ }else{
+ getApp().confirmBox(e.data.msg);
+ }
+ }
+ });
+ }
+ })
+
+
}
+
+
})
diff --git a/pages/togoin/togoin.wxml b/pages/togoin/togoin.wxml
index f783036..216e723 100644
--- a/pages/togoin/togoin.wxml
+++ b/pages/togoin/togoin.wxml
@@ -14,13 +14,27 @@
-
-
+
+
+
+
+
+
+
+
+
+
+