Skip to content

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

临时提交

parent 26cbedf8
Expand all Show whitespace changes
Inline Side-by-side
Showing with 709 additions and 596 deletions
pages.json
View file @ b44f1601
...@@ -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"
} }
}, },
...@@ -265,36 +265,36 @@ ...@@ -265,36 +265,36 @@
"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"
}] }]
} }
......
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
...@@ -3,7 +3,7 @@ export default { ...@@ -3,7 +3,7 @@ export default {
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) {
//网络请求 //网络请求
...@@ -49,16 +49,16 @@ export default { ...@@ -49,16 +49,16 @@ export default {
}, },
success: res => { success: res => {
if(res.data.resultCode == 10000){ if (res.data.resultCode == 10000) {
let u = uni.getStorageSync("mall_UserInfo"); let u = uni.getStorageSync("mall_UserInfo");
if(u){ if (u) {
this.getLogin_t(u) this.getLogin_t(u)
typeof failed == "function" && failed(res.data); typeof failed == "function" && failed(res.data);
} }
}else if(res.data.resultCode != 1) { } else if (res.data.resultCode != 1) {
if( res.data.message!=''){ if (res.data.message != '') {
uni.showToast({ uni.showToast({
title: res.data.message, title: res.data.message,
icon: "none", icon: "none",
...@@ -69,8 +69,7 @@ export default { ...@@ -69,8 +69,7 @@ export default {
typeof failed == "function" && failed(res.data); typeof failed == "function" && failed(res.data);
} } else {
else{
typeof success == "function" && success(res.data); typeof success == "function" && success(res.data);
} }
...@@ -86,10 +85,9 @@ export default { ...@@ -86,10 +85,9 @@ export default {
} }
// token失效再次登录接口 // token失效再次登录接口
Vue.prototype.getLogin_t = function(obj) { Vue.prototype.getLogin_t = function(obj) {
let pid = uni.getStorageSync("pid")?uni.getStorageSync("pid").pid:0; let pid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0;
let SmallShopId = uni.getStorageSync("SmallShopId")?uni.getStorageSync("SmallShopId").SmallShopId:0; let SmallShopId = uni.getStorageSync("SmallShopId") ? uni.getStorageSync("SmallShopId").SmallShopId : 0;
this.request2( this.request2({
{
url: '/api/AppletLogin/Login', url: '/api/AppletLogin/Login',
data: { data: {
Source: 1, Source: 1,
...@@ -98,7 +96,7 @@ export default { ...@@ -98,7 +96,7 @@ export default {
Photo: obj.Photo, Photo: obj.Photo,
Moblie: '', Moblie: '',
SuperiorId: pid, SuperiorId: pid,
SmallShopId:SmallShopId, SmallShopId: SmallShopId,
} }
}, },
res => { res => {
...@@ -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