Commit a2326672 authored by zhangjianguo's avatar zhangjianguo

1

parent 92662469
...@@ -102,6 +102,7 @@ export default { ...@@ -102,6 +102,7 @@ export default {
//登录 //登录
getLogin(obj) { getLogin(obj) {
var that = this; var that = this;
let pid = uni.getStorageSync("pid")?uni.getStorageSync("pid").pid:0;
that.request2( that.request2(
{ {
url: '/api/AppletLogin/Login', url: '/api/AppletLogin/Login',
...@@ -111,13 +112,14 @@ export default { ...@@ -111,13 +112,14 @@ export default {
Name: obj.Name, Name: obj.Name,
Photo: obj.Photo, Photo: obj.Photo,
Moblie: '', Moblie: '',
SuperiorId: 0 SuperiorId: pid
} }
}, },
res => { res => {
if (res.resultCode == 1) { if (res.resultCode == 1) {
uni.setStorageSync('mall_UserInfo', res.data); uni.setStorageSync('mall_UserInfo', res.data);
that.$emit('changeuserinfo'); that.$emit('changeuserinfo');
uni.removeStorageSync('pid');
} }
} }
); );
......
...@@ -222,7 +222,7 @@ export default { ...@@ -222,7 +222,7 @@ export default {
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
margin-bottom: 3px; margin-bottom: 3px;
font-size: 14px; font-size: 14px;
height: 36px; height: 38px;
margin-bottom: 5px; margin-bottom: 5px;
} }
.catstyle11 .good .good-info { .catstyle11 .good .good-info {
......
...@@ -288,6 +288,9 @@ export default { ...@@ -288,6 +288,9 @@ export default {
}else{ }else{
this.id = option.GoodsId ? option.GoodsId : 29; //40887 59512 46942 this.id = option.GoodsId ? option.GoodsId : 29; //40887 59512 46942
} }
if(option&&option.pid){
uni.setStorageSync("pid", {pid:option.pid});
}
this.init(); this.init();
this.mc = this.$uiConfig.mainColor; this.mc = this.$uiConfig.mainColor;
this.secondary = this.$uiConfig.secondary; this.secondary = this.$uiConfig.secondary;
......
...@@ -137,6 +137,13 @@ export default { ...@@ -137,6 +137,13 @@ export default {
if(options&&options.page_id){ if(options&&options.page_id){
this.pageId=options.page_id this.pageId=options.page_id
} }
if(options&&options.pid){
uni.setStorageSync("pid", {pid:options.pid});
}
let c = this.$uiConfig.is_bang ? 78 : 50; let c = this.$uiConfig.is_bang ? 78 : 50;
this.contentHeight = this.$utils.calcContentHeight(c); this.contentHeight = this.$utils.calcContentHeight(c);
this.init(); this.init();
......
...@@ -307,6 +307,7 @@ export default { ...@@ -307,6 +307,7 @@ export default {
uni.requestSubscribeMessage({ uni.requestSubscribeMessage({
tmplIds: this.ds.template_message_list, tmplIds: this.ds.template_message_list,
complete(res) { complete(res) {
console.log(res)
that.submitOrder = false; that.submitOrder = false;
let form = {}; let form = {};
form.Consignee = that.adressInfo.Consignee; form.Consignee = that.adressInfo.Consignee;
...@@ -345,42 +346,7 @@ export default { ...@@ -345,42 +346,7 @@ export default {
uni.hideNavigationBarLoading(); uni.hideNavigationBarLoading();
} }
); );
// let h = that.apiheader();
// h["content-type"] = "application/x-www-form-urlencoded";
// that.request(
// {
// data: {
// r: "api/order/submit",
// form_data: JSON.stringify(forms),
// },
// header: h,
// method: "POST",
// },
// (res) => {
// console.log(res.data);
// //TODO 未实现 支付 开始调起支付
// uni.navigateTo({
// url: '/pages/order-submit/pay-success'
// });
// uni.showModal({
// title: "下单提醒",
// content:
// "订单已经创建成功,等待后端实现支付调用,是否前往订单列表",
// success: function (res) {
// if (res.confirm) {
// that.isLeave = true;
// uni.navigateTo({
// url: "/pages/order/index",
// });
// } else if (res.cancel) {
// console.log("用户点击取消");
// }
// },
// });
// }
// );
} }
}); });
} }
...@@ -704,7 +670,7 @@ button[disabled]{ ...@@ -704,7 +670,7 @@ button[disabled]{
flex: 1; flex: 1;
} }
.ordersubmit .goodbox .goodinfo .name { .ordersubmit .goodbox .goodinfo .name {
height: 16px; height: 18px;
font-size: 14px; font-size: 14px;
color: #232323; color: #232323;
white-space: nowrap; white-space: nowrap;
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
{ {
url: '/api/AppletUser/GetWeiXinQRCodeForApplet', url: '/api/AppletUser/GetWeiXinQRCodeForApplet',
data: { data: {
Path:'pages/index/index/pid='+this.UserInfo.UserId, Path:'pages/index/index/?pid=' + this.UserInfo.UserId,
With:this.qrcode.QrCodeSize, With:this.qrcode.QrCodeSize,
} }
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment