Skip to content

M
mallapp
Commit b44f1601 authored by 罗超's avatar 罗超
Browse files
Options

临时提交

parent 26cbedf8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 709 additions and 596 deletions
pages.json
View file @ b44f1601
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
{ {
"path": "pages/webbox/webbox" "path": "pages/webbox/webbox"
} }
], ],
"subPackages": [{ "subPackages": [{
"root": "pages/goods", "root": "pages/goods",
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
"root": "pages/live", "root": "pages/live",
"plugins": { "plugins": {
"live-player-plugin": { "live-player-plugin": {
"version": "1.1.4", "version": "1.1.8",
"provider": "wx2b03c6e691cd7370" "provider": "wx2b03c6e691cd7370"
} }
}, },
...@@ -253,51 +253,51 @@ ...@@ -253,51 +253,51 @@
} }
] ]
}, },
{ {
"root": "pages/microShop", "root": "pages/microShop",
"pages": [{ "pages": [{
"path": "index/index", "path": "index/index",
"style": { "style": {
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
{ {
"path": "myClients/myClients" "path": "myClients/myClients"
}, },
{ {
"path":"wdWithdrawal" "path": "wdWithdrawal"
}, },
{ {
"path":"wdOrder" "path": "wdOrder"
}, },
{ {
"path":"wdCase" "path": "wdCase"
}, },
{ {
"path":"shopSettings" "path": "shopSettings"
}, },
{ {
"path":"storeManagement/storeManagement" "path": "storeManagement/storeManagement"
}, },
{ {
"path":"storeManagement/goodsEdit" "path": "storeManagement/goodsEdit"
}, },
{ {
"path":"storeManagement/addGoods" "path": "storeManagement/addGoods"
}, },
{ {
"path":"storeManagement/index" "path": "storeManagement/index"
} }
] ]
}, },
{ {
"root":"pages/quick_share", "root": "pages/quick_share",
"pages":[{ "pages": [{
"path": "index" "path": "index"
}] }]
} }
], ],
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
......
pages/goods/goods.vue
View file @ b44f1601
...@@ -462,13 +462,13 @@ export default { ...@@ -462,13 +462,13 @@ export default {
}, },
initImages() { initImages() {
// let that = this; // let that = this;
let info = uni.createSelectorQuery().in(this); // let info = uni.createSelectorQuery().in(this);
info // info
.select(".goods") // .select(".goods")
.boundingClientRect((data) => { // .boundingClientRect((data) => {
console.log("得到布局位置信息" + JSON.stringify(data)); // console.log("得到布局位置信息" + JSON.stringify(data));
}) // })
.exec(); // .exec();
// info // info
// .boundingClientRect(function (data) { // .boundingClientRect(function (data) {
// console.log(data) // console.log(data)
......
pages/order/order-commit.vue 0 → 100644
View file @ b44f1601
<template>
<view class="commit-box">
</view>
</template>
<script>
export default {
}
</script>
<style>
</style>
\ No newline at end of file
pages/quick_share/index.vue
View file @ b44f1601
This diff is collapsed.
plugin/api.js
View file @ b44f1601
export default { export default {
install(Vue, options) { install(Vue, options) {
Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285" Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285"
// Vue.prototype.host2 = "http://192.168.0.110:8200" // Vue.prototype.host2 = "http://192.168.0.110:8200"
// Vue.prototype.host2 = "https://mallApi.oytour.com" // Vue.prototype.host2 = "https://mallApi.oytour.com"
Vue.prototype.host2 = "http://192.168.2.16:8088" Vue.prototype.host2 = "https://mallApi.oytour.com"
// Vue.prototype.host2 = "http://192.168.2.65" // Vue.prototype.host2 = "http://192.168.2.65"
Vue.prototype.request = function(param, success, failed) { Vue.prototype.request = function(param, success, failed) {
//网络请求
uni.request({
url: this.host + "&r=" + param.data.r,
method: param.method || "GET",
header: param.header || {
'content-type': "application/json"
},
data: param.data,
success: res => {
if (res.data.code != 0 && res.data.msg != "商品未上架") {
}
typeof success == "function" && success(res.data);
},
fail: (e) => {
console.log("网络请求fail:" + JSON.stringify(e));
uni.showModal({
content: "" + res.errMsg
});
typeof failed == "function" && failed(res.data);
}
});
}
Vue.prototype.request2 = function(param, success, failed) {
//网络请求 //网络请求
uni.request({ uni.request({
url: this.host2 + param.url, url: this.host + "&r=" + param.data.r,
method: param.method || "Post", method: param.method || "GET",
header: param.header || { header: param.header || {
'content-type': "application/json" 'content-type': "application/json"
}, },
data: { data: param.data,
MallBaseId: 1,
TenantId: 1,
OpenId: this.GetOpenId().OpenId,
UserId: this.GetOpenId().UserId,
SmallShopsId: this.GetOpenId().SmallShopsId,
MiniAppId: this.GetMiniAppId(),
msg: param.data,
token: this.GetOpenId().token
},
success: res => { success: res => {
if (res.data.code != 0 && res.data.msg != "商品未上架") {
if(res.data.resultCode == 10000){
let u = uni.getStorageSync("mall_UserInfo");
if(u){
this.getLogin_t(u)
typeof failed == "function" && failed(res.data);
}
}else if(res.data.resultCode != 1) {
if( res.data.message!=''){
uni.showToast({
title: res.data.message,
icon: "none",
});
}
typeof failed == "function" && failed(res.data);
}
else{
typeof success == "function" && success(res.data);
} }
typeof success == "function" && success(res.data);
}, },
fail: (e) => { fail: (e) => {
console.log("网络请求fail:" + JSON.stringify(e)); console.log("网络请求fail:" + JSON.stringify(e));
...@@ -84,36 +29,89 @@ export default { ...@@ -84,36 +29,89 @@ export default {
} }
}); });
} }
// token失效再次登录接口 Vue.prototype.request2 = function(param, success, failed) {
Vue.prototype.getLogin_t = function(obj) { //网络请求
let pid = uni.getStorageSync("pid")?uni.getStorageSync("pid").pid:0; uni.request({
let SmallShopId = uni.getStorageSync("SmallShopId")?uni.getStorageSync("SmallShopId").SmallShopId:0; url: this.host2 + param.url,
this.request2( method: param.method || "Post",
{ header: param.header || {
url: '/api/AppletLogin/Login', 'content-type': "application/json"
data: { },
Source: 1, data: {
OpenId: obj.OpenId, MallBaseId: 1,
Name: obj.Name, TenantId: 1,
Photo: obj.Photo, OpenId: this.GetOpenId().OpenId,
Moblie: '', UserId: this.GetOpenId().UserId,
SuperiorId: pid, SmallShopsId: this.GetOpenId().SmallShopsId,
SmallShopId:SmallShopId, MiniAppId: this.GetMiniAppId(),
} msg: param.data,
}, token: this.GetOpenId().token
res => { },
if (res.resultCode == 1) { success: res => {
uni.setStorageSync('mall_UserInfo', res.data);
uni.removeStorageSync('pid'); if (res.data.resultCode == 10000) {
uni.removeStorageSync('SmallShopId');
} let u = uni.getStorageSync("mall_UserInfo");
} if (u) {
); this.getLogin_t(u)
} typeof failed == "function" && failed(res.data);
// 获取小程序APPID }
} else if (res.data.resultCode != 1) {
if (res.data.message != '') {
uni.showToast({
title: res.data.message,
icon: "none",
});
}
typeof failed == "function" && failed(res.data);
} else {
typeof success == "function" && success(res.data);
}
},
fail: (e) => {
console.log("网络请求fail:" + JSON.stringify(e));
uni.showModal({
content: "" + res.errMsg
});
typeof failed == "function" && failed(res.data);
}
});
}
// token失效再次登录接口
Vue.prototype.getLogin_t = function(obj) {
let pid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0;
let SmallShopId = uni.getStorageSync("SmallShopId") ? uni.getStorageSync("SmallShopId").SmallShopId : 0;
this.request2({
url: '/api/AppletLogin/Login',
data: {
Source: 1,
OpenId: obj.OpenId,
Name: obj.Name,
Photo: obj.Photo,
Moblie: '',
SuperiorId: pid,
SmallShopId: SmallShopId,
}
},
res => {
if (res.resultCode == 1) {
uni.setStorageSync('mall_UserInfo', res.data);
uni.removeStorageSync('pid');
uni.removeStorageSync('SmallShopId');
}
}
);
}
// 获取小程序APPID
Vue.prototype.GetMiniAppId = function() { Vue.prototype.GetMiniAppId = function() {
return 'wxacd9f8cc3480d29e' return 'wxacd9f8cc3480d29e'
// return 'wxcf0727a7c78b501e' //旅小友 // return 'wxcf0727a7c78b501e' //旅小友
} }
//获取OpenId //获取OpenId
Vue.prototype.GetOpenId = function() { Vue.prototype.GetOpenId = function() {
...@@ -122,7 +120,7 @@ export default { ...@@ -122,7 +120,7 @@ export default {
OpenId: '', OpenId: '',
UserId: 0, UserId: 0,
token: '', token: '',
SmallShopsId:0, SmallShopsId: 0,
} }
if (mall_userinfo) { if (mall_userinfo) {
if (mall_userinfo.OpenId) { if (mall_userinfo.OpenId) {
......
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