作者 梁鹏山

fix:更新同步

... ... @@ -7,9 +7,10 @@
<view class="word">{{type == 3?item.name:type==2?item.product_name:item.product.name}}</view>
<view class="info">
<view class="jifen">
<view class="name">积分</view>
<text wx:if='{{item.product.price2!=null||item.price2!=null}}'>{{type == 3 || type == 2?item.price2:item.product.price2}}</text>
<text wx:else>{{type == 3 || type == 2?item.goods_price:item.product.price}}</text>
<!-- 2023-10-19 需求要将积分改为微信支付的金额 -->
<!-- <view class="name">积分</view> -->
<text wx:if='{{item.product.price2!=null||item.price2!=null}}'>¥{{type == 3 || type == 2?item.price2:item.product.price2}}</text>
<text wx:else>¥{{type == 3 || type == 2?item.goods_price:item.product.price}}</text>
<text style="margin-left: 10rpx;color:#ccc;font-size: 28rpx;" wx:if="{{type == 3 || type == 4}}">X{{item.num}}</text>
</view>
<view class="num_box" wx:if="{{type == 1}}">
... ...
... ... @@ -2,15 +2,12 @@ App({
onLaunch: function () {
if (wx.getStorageSync('token')) {
this.getmessagelist()
}
this.getToken();
//自动更新版本
const updateManager = wx.getUpdateManager()
updateManager.onCheckForUpdate(function (res) {
// 请求完新版本信息的回调
})
updateManager.onUpdateReady(function () {
wx.showModal({
... ... @@ -46,15 +43,12 @@ App({
// let baseUrl = 'http://binhaitest.w.brotop.cn/api'
// 滨海
var entrance_type = wx.getStorageSync("entrance_type");
console.log(entrance_type);
if (entrance_type == '1' || entrance_type == '0' || url == '/getopenid/get' || url.indexOf('/wb/wb')>-1) {
if (entrance_type == '1' || entrance_type == '0' || url == '/getopenid/get' || url.indexOf('/wb/wb') > -1) {
//劳保商城入口
console.log('11111111111111111')
baseUrl = 'https://binhai.w.broing.cn/api';
// baseUrl = 'http://binhai.shs.broing.cn/api'
} else if (entrance_type == '2') {
//工会商城入口
console.log('@@@@@@@@@@@@@@@@@@@@@@')
baseUrl = 'https://binhaigh.w.broing.cn/api';
// baseUrl = 'http://gonghui.shs.broing.cn/api'
} else if (entrance_type == '3') {
... ... @@ -72,7 +66,6 @@ App({
// //工会商城入口
// baseUrl = 'https://bgcb2.w.broing.cn/api';
// }
console.log(baseUrl);
//网络请求
wx.request({
url: baseUrl + url,
... ... @@ -83,7 +76,6 @@ App({
'token': wx.getStorageSync('token') || ''
},
success: function (res) { //返回取得的数据
console.log('ssssssssssssssssssssssssssssssssssss', res)
if (res.data.code == '200') {
resolve(res.data)
} else if (res.data.code == '5000') {
... ... @@ -101,7 +93,6 @@ App({
url: '/pages/register/register?type=1',
})
}, 1200)
} else {
wx.showModal({
title: '提示',
... ... @@ -297,15 +288,10 @@ App({
}
})
}
}).catch((err) => { })
},
onShow: function () {
console.log('hahahahhahahahhhahh')
},
onShow: function () { },
//接口管理
interface: {
... ...
const app=getApp()
const app = getApp()
Component({
/**
* 组件的属性列表
... ... @@ -19,19 +19,20 @@ Component({
*/
methods: {
look_more(e) {
let login_new=app.globalData.login_new;
if(login_new==0){
wx.showToast({
title: '您还不是会员',
icon:"none"
})
setTimeout(function(){
wx.navigateTo({
url: '/packageA/pages/login/login',
})
},1500)
return false
}
// 2023-10-19 需求是任何人都可以看商品
// let login_new=app.globalData.login_new;
// if(login_new==0){
// wx.showToast({
// title: '您还不是会员',
// icon:"none"
// })
// setTimeout(function(){
// wx.navigateTo({
// url: '/packageA/pages/login/login',
// })
// },1500)
// return false
// }
let id = e.currentTarget.dataset.id
wx.navigateTo({
url: '/packageA/pages/shop_detail/shop_detail?id=' + id
... ...
... ... @@ -62,9 +62,6 @@ Page({
]
},
scroll(e) {
// console.log(e.detail.scrollTop)
// if (e.detail.scrollTop >300){
... ... @@ -77,13 +74,13 @@ Page({
// stick:0
// })
// }
// console.log(this.data.stick)
},
onLoad: function (options) {
console.log(app.globalData.index)
if (options.token) {
wx.setStorageSync('token', options.token)
}
if (wx.getStorageSync('entrance_type') == '2') {
wx.setNavigationBarTitle({
title: '工会商城'
... ... @@ -97,57 +94,44 @@ Page({
title: '办公采办'
})
}
if (app.globalData.index == undefined) {
let that = this;
let token = wx.getStorageSync('token');
console.log('woshitoe', token);
if (token != "") {
console.log(9999)
this.getInfoFun()
}
this.get_notice()
this.get_shopnum()
this.getmessagelist();
console.log('998867', this.data.pid)
if (this.data.pid) {
this.get_info(this.data.pid, 2);
} else {
this.get_info(0, 1);
}
// 获取活动专区
this.getzhuanqulist();
this.getxianshi();
setTimeout(function () {
that.setData({
showtime: true
})
}, 990)
}
// if (app.globalData.index == undefined) {
// let that = this;
// let token = wx.getStorageSync('token');
// if (token != "") {
// this.getInfoFun()
// }
// this.get_notice()
// this.get_shopnum()
// this.getmessagelist();
// if (this.data.pid) {
// this.get_info(this.data.pid, 2);
// } else {
// this.get_info(0, 1);
// }
// // 获取活动专区
// this.getzhuanqulist();
// this.getxianshi();
// setTimeout(function () {
// that.setData({
// showtime: true
// })
// }, 990)
// }
//控制显示隐藏
this.ishow()
// this.ishow()
},
// 获取个人信息
getInfoFun() {
let that = this;
let u = app.interface.readteacher;
app.post(u, {}).then((r) => {
console.log('3489523498', r)
if (r.code == 200) {
app.globalData.login_new = r.msg.login_new;
app.globalData.status = r.msg.status;
console.log(app.globalData.status)
// t.setData({
// obj: r.msg
// })
}
})
}).catch({})
},
moremiao() {
let token = wx.getStorageSync("token")
if (token == '') {
... ... @@ -163,8 +147,9 @@ Page({
}
})
} else {
let login_new = wx.getStorageSync("login");
if (login_new == 0) {
// 2023-10-19 需求是无需登录
// let login_new = wx.getStorageSync("login");
// if (login_new == 0) {
// wx.showToast({
// title: '您还不是会员',
// icon:"none"
... ... @@ -175,23 +160,19 @@ Page({
// })
// },1500)
// return false
wx.showModal({
title: '提示',
content: '您还不是会员',
success(res) {
if (res.confirm) {
wx.navigateTo({
url: '/packageA/pages/login/login',
})
} else if (res.cancel) { }
}
})
return false
}
// wx.showModal({
// title: '提示',
// content: '您还不是会员',
// success(res) {
// if (res.confirm) {
// wx.navigateTo({
// url: '/packageA/pages/login/login',
// })
// } else if (res.cancel) { }
// }
// })
// return false
// }
wx.navigateTo({
url: '/packageA/pages/xianshi/xianshi?title2=' + this.data.title2,
})
... ... @@ -203,19 +184,13 @@ Page({
ishow() {
let that = this
let url = '//wb/wb';
let data = {
}
let data = {}
app.post(url, data, "POST").then((r) => {
console.log('4456789', r)
that.setData({
status1: r.msg.status1,
status2: r.msg.status2,
title2: r.msg.title2
})
}).catch((err) => { })
},
... ... @@ -226,28 +201,19 @@ Page({
let data = {
page: 1,
pageNum: 6
}
app.post(url, data, "POST").then((r) => {
console.log(r)
console.log(r.msg.residue_time)
that.setData({
xianshilist: r.msg.list,
endTime: r.msg.residue_time,
activitystatus: r.msg.status
})
var time = that.date_format(r.msg.residue_time);
console.log('9988776', that.data.activitystatus)
that.countDown()
console.log(that.data.xianshilist)
// that.setData({
// messagelist: that.data.messagelist.concat(r.msg)
// })
// console.log(that.data.messagelist)
}).catch((err) => { })
},
... ... @@ -307,14 +273,10 @@ Page({
that.setData({
activity: r.msg
})
console.log(that.data.activity)
// that.setData({
// messagelist: that.data.messagelist.concat(r.msg)
// })
// console.log(that.data.messagelist)
}).catch((err) => { })
},
... ... @@ -335,27 +297,26 @@ Page({
}
})
} else {
let login_new = wx.getStorageSync('login');
if (login_new == 0) {
wx.showModal({
title: '提示',
content: '您还不是会员',
success(res) {
if (res.confirm) {
wx.navigateTo({
url: '/packageA/pages/login/login',
})
} else if (res.cancel) { }
}
})
return false
}
// 2023-10-19 需求是无需登录
// let login_new = wx.getStorageSync('login');
// if (login_new == 0) {
// wx.showModal({
// title: '提示',
// content: '您还不是会员',
// success(res) {
// if (res.confirm) {
// wx.navigateTo({
// url: '/packageA/pages/login/login',
// })
// } else if (res.cancel) { }
// }
// })
// return false
// }
wx.navigateTo({
url: '/packageA/pages/zhuanqu/zhuanqu?id=' + id,
})
}
},
more() {
... ... @@ -372,27 +333,24 @@ Page({
} else if (res.cancel) { }
}
})
return false
}
let login_new = wx.getStorageSync('login');
if (login_new == 0) {
wx.showModal({
title: '提示',
content: '您还不是会员',
success(res) {
if (res.confirm) {
wx.navigateTo({
url: '/packageA/pages/login/login',
})
} else if (res.cancel) { }
}
})
return false
}
// 2023-10-19 需求是无需登录
// let login_new = wx.getStorageSync('login');
// if (login_new == 0) {
// wx.showModal({
// title: '提示',
// content: '您还不是会员',
// success(res) {
// if (res.confirm) {
// wx.navigateTo({
// url: '/packageA/pages/login/login',
// })
// } else if (res.cancel) { }
// }
// })
// return false
// }
wx.navigateTo({
url: '/packageA/pages/classify/classify',
})
... ... @@ -419,65 +377,66 @@ Page({
}
})
} else {
let login_new = wx.getStorageSync('login');
let gh_login = wx.getStorageSync('gh_login');
let cb_login = wx.getStorageSync('cb_login');
let loginType = wx.getStorageSync('entrance_type');
if (loginType == 1) {
if (login_new == 0) {
wx.showModal({
title: '提示',
content: '请绑定账户后操作',
success(res) {
if (res.confirm) {
wx.navigateTo({
url: '/packageA/pages/login/login',
})
} else if (res.cancel) {
// 2023-10-19 需求是无需登录
// let login_new = wx.getStorageSync('login');
// let gh_login = wx.getStorageSync('gh_login');
// let cb_login = wx.getStorageSync('cb_login');
// let loginType = wx.getStorageSync('entrance_type');
// if (loginType == 1) {
// if (login_new == 0) {
// wx.showModal({
// title: '提示',
// content: '请绑定账户后操作',
// success(res) {
// if (res.confirm) {
// wx.navigateTo({
// url: '/packageA/pages/login/login',
// })
// } else if (res.cancel) {
}
}
})
// }
// }
// })
return false
}
} else if(loginType == 2){
if (gh_login == 0) {
wx.showModal({
title: '提示',
content: '请绑定账户后操作',
success(res) {
if (res.confirm) {
wx.navigateTo({
url: '/packageA/pages/login/login',
})
} else if (res.cancel) {
// return false
// }
// } else if (loginType == 2) {
// if (gh_login == 0) {
// wx.showModal({
// title: '提示',
// content: '请绑定账户后操作',
// success(res) {
// if (res.confirm) {
// wx.navigateTo({
// url: '/packageA/pages/login/login',
// })
// } else if (res.cancel) {
}
}
})
// }
// }
// })
return false
}
}else if(loginType == 3){
if (cb_login == 0) {
wx.showModal({
title: '提示',
content: '请绑定账户后操作',
success(res) {
if (res.confirm) {
wx.navigateTo({
url: '/packageA/pages/login/login',
})
} else if (res.cancel) {
// return false
// }
// } else if (loginType == 3) {
// if (cb_login == 0) {
// wx.showModal({
// title: '提示',
// content: '请绑定账户后操作',
// success(res) {
// if (res.confirm) {
// wx.navigateTo({
// url: '/packageA/pages/login/login',
// })
// } else if (res.cancel) {
}
}
})
// }
// }
// })
return false
}
}
// return false
// }
// }
let title = this.data.nav_arr[this.data.nav_index].name
let index = e.currentTarget.dataset.index ? e.currentTarget.dataset.index : 0
... ... @@ -512,21 +471,22 @@ Page({
}
})
} else {
let login_new = wx.getStorageSync('login');
if (login_new == 0) {
wx.showModal({
title: '提示',
content: '您还不是会员',
success(res) {
if (res.confirm) {
wx.navigateTo({
url: '/packageA/pages/login/login',
})
} else if (res.cancel) { }
}
})
return false
}
// 2023-10-19 需求是无需登录
// let login_new = wx.getStorageSync('login');
// if (login_new == 0) {
// wx.showModal({
// title: '提示',
// content: '您还不是会员',
// success(res) {
// if (res.confirm) {
// wx.navigateTo({
// url: '/packageA/pages/login/login',
// })
// } else if (res.cancel) { }
// }
// })
// return false
// }
if (style == 2) {
wx.navigateTo({
url: '/packageA/pages/outerChain/outerChain?src=' + e.currentTarget.dataset.src
... ... @@ -539,10 +499,6 @@ Page({
}
},
// 排序
reorder(e) {
let that = this
... ... @@ -735,7 +691,7 @@ Page({
index: 2,
})
}
})
}).catch(err => {})
},
getmessagelist() {
... ... @@ -744,28 +700,22 @@ Page({
let data = {
page: 1,
pageNum: 10,
}
app.post(url, data, "POST").then((r) => {
// console.log(r)
// that.setData({
// messagelist: that.data.messagelist.concat(r.msg)
// })
let newlist = [];
r.msg.forEach(function (value, index, array) {
console.log(newlist)
if (value.status == 1) {
newlist.push(value)
}
})
console.log('77889944556', newlist)
if (newlist.length != 0) {
wx.showTabBarRedDot({
index: 1,
success: function (red) {
wx.setTabBarBadge({
index: 1,
text: newlist.length.toString(),
... ... @@ -773,8 +723,6 @@ Page({
}
})
}
}).catch((err) => { })
},
// 获取个人信息
... ... @@ -790,37 +738,28 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
this.setData({
logok: app.globalData.baseUrlimg + "assets/img/cb2ad36a391388f19f5f912fa021f8f.png"
})
console.log(this.data.logok)
// this.logok=app.globalData.baseUrlimg+"assets/img/cb2ad36a391388f19f5f912fa021f8f.png''
this.get_banner()
console.log(app.globalData.index)
if (app.globalData.index == 0) {
app.globalData.index = undefined
// if (app.globalData.index == 0) {
// app.globalData.index = undefined
let token = wx.getStorageSync('token');
console.log('woshitoe', token)
if (token != "") {
this.getInfoFun()
}
this.get_notice()
this.get_shopnum()
this.getmessagelist();
console.log('998867', this.data.pid)
if (this.data.pid) {
this.get_info(this.data.pid, 2);
} else {
this.get_info(0, 1);
}
//控制显示隐藏
this.ishow()
}
// }
},
/**
... ...
... ... @@ -8,39 +8,39 @@ Page({
data: {
page: 1,
messagelist: [],
token:'',
login_new:'',
selected:1,
list:[{
        pagePath: "/packageA/pages/index/index",
        text: "商品",
        iconPath: "/images/tabbar/icon_75.png",
        selectedIconPath: "/images/tabbar/icon_68.png"
      },
      {
        pagePath: "/packageA/pages/message/message",
        text: "消息",
        iconPath: "/images/tabbar/message.png",
        selectedIconPath: "/images/tabbar/messageactive.png"
      },
      {
        pagePath: "/packageA/pages/shop_cart/shop_cart",
        text: "购物车",
        iconPath: "/images/tabbar/icon_70.png",
        selectedIconPath: "/images/tabbar/icon_73.png"
      },
      {
        pagePath"/packageA/pages/my/my",
        text"我的",
        iconPath"/images/tabbar/icon_71.png",
        selectedIconPath"/images/tabbar/icon_72.png"
      }]
token: '',
login_new: '',
selected: 1,
list: [{
pagePath: "/packageA/pages/index/index",
text: "商品",
iconPath: "/images/tabbar/icon_75.png",
selectedIconPath: "/images/tabbar/icon_68.png"
},
{
pagePath: "/packageA/pages/message/message",
text: "消息",
iconPath: "/images/tabbar/message.png",
selectedIconPath: "/images/tabbar/messageactive.png"
},
{
pagePath: "/packageA/pages/shop_cart/shop_cart",
text: "购物车",
iconPath: "/images/tabbar/icon_70.png",
selectedIconPath: "/images/tabbar/icon_73.png"
},
{
pagePath: "/packageA/pages/my/my",
text: "我的",
iconPath: "/images/tabbar/icon_71.png",
selectedIconPath: "/images/tabbar/icon_72.png"
}]
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
onLoad: function (options) {
},
... ... @@ -59,7 +59,7 @@ Page({
})
let newlist = [];
that.data.messagelist.forEach(function(value, index, array) {
that.data.messagelist.forEach(function (value, index, array) {
console.log(newlist)
if (value.status == 1) {
newlist.push(value)
... ... @@ -70,14 +70,14 @@ Page({
if (newlist.length != 0) {
wx.showTabBarRedDot({
index: 1,
success: function(red) {
success: function (red) {
wx.setTabBarBadge({
index: 1,
text: newlist.length.toString(),
})
}
})
}else{
} else {
wx.hideTabBarRedDot({
index: 1,
success: function (red) {
... ... @@ -91,7 +91,7 @@ Page({
}
}).catch((err) => {})
}).catch((err) => { })
},
// 订单详情
... ... @@ -105,17 +105,17 @@ Page({
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function() {
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
onShow: function () {
this.setData({
token:wx.getStorageSync('token'),
login_new:app.globalData.login_new
token: wx.getStorageSync('token'),
login_new: app.globalData.login_new
})
this.setData({
... ... @@ -128,28 +128,28 @@ Page({
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function() {
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function() {
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function() {
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
onReachBottom: function () {
let newpage = this.data.page;
newpage++;
this.setData({
... ... @@ -161,7 +161,7 @@ Page({
/**
* 用户点击右上角分享
*/
onShareAppMessage: function() {
onShareAppMessage: function () {
}
})
\ No newline at end of file
... ...
... ... @@ -2,9 +2,9 @@
<navigator class="no_login" catchtap="go_login" url="/packageA/pages/register/register" hover-class="none">请先登录</navigator>
</block>
<block wx:elif="{{login_new==''}}">
<!-- <block wx:elif="{{login_new==''}}">
<navigator class="no_login" catchtap="go_login" url="/packageA/pages/login/login" hover-class="none">请先绑定会员</navigator>
</block>
</block> -->
<block wx:else>
<view class="empty" wx:if="{{messagelist.length==0}}">暂无更多数据</view>
... ...
... ... @@ -125,8 +125,8 @@ Page({
let t = this;
let type = e.currentTarget.dataset.i;
let index = e.currentTarget.dataset.t;
if (wx.getStorageSync("token") && !this.data.noBind && index != 5) {
if (wx.getStorageSync("token") && index != 5) {
// if (wx.getStorageSync("token") && !this.data.noBind && index != 5) {
if (index == 1) {
// 跳转订单列表
wx.navigateTo({
... ... @@ -178,25 +178,25 @@ Page({
return false
}
// 2023-10-19 需求取消登录限制
// if(this.data.noBind){
// wx.showModal({
// title: '提示',
// content: '请绑定账号后操作',
// confirmText:'去绑定',
// cancelText:'取消',
// success(res) {
// if (res.confirm) {
// wx.navigateTo({
// url: '/packageA/pages/login/login',
// })
// } else if (res.cancel) {
// }
// }
// })
if(this.data.noBind){
wx.showModal({
title: '提示',
content: '请绑定账号后操作',
confirmText:'去绑定',
cancelText:'取消',
success(res) {
if (res.confirm) {
wx.navigateTo({
url: '/packageA/pages/login/login',
})
} else if (res.cancel) {
}
}
})
return false
}
// return false
// }
}
},
//获取购物车数量
... ...
... ... @@ -14,13 +14,13 @@
</view>
<!-- <view class="company">{{obj.competition}}</view> -->
<view class="info_box" wx:if="{{noBind}}">
<!-- <view class="info_box" wx:if="{{noBind}}">
<view class="bindNote">点击绑定账号</view>
</view>
<view class="info_box" wx:else>
</view> -->
<view class="info_box">
<view>{{obj.job?obj.job:'暂无'}}</view>
<!-- <view>{{obj.section?obj.section:'暂无'}}</view> -->
<view>{{obj.tel}}</view>
<view>{{obj.tel?obj.tel:''}}</view>
</view>
</view>
</view>
... ...
... ... @@ -8,21 +8,21 @@ Page({
success: false,
fail: false,
name: '',
choudanNum:0,
choudanNum: 0,
addressId: 0,
tel: '',
area: '',
address: '',
cover_type: false,
total:'',
info:{
address:{
address:'',
area:'',
id:'',
tel:'',
name:''
total: '',
info: {
address: {
address: '',
area: '',
id: '',
tel: '',
name: ''
}
}
... ... @@ -36,16 +36,16 @@ Page({
let index = e.currentTarget.dataset.index
let id = e.currentTarget.dataset.id
let check = e.currentTarget.dataset.check
let coudan = this.data.coudan||[]
let coudan_arr = this.data.coudan_arr||[]
let coudan = this.data.coudan || []
let coudan_arr = this.data.coudan_arr || []
let price = e.currentTarget.dataset.price;
let price2 = e.currentTarget.dataset.price2;
if (type == 1) {
if(this.data.info.choudan*100<(price*100)){
if (this.data.info.choudan * 100 < (price * 100)) {
wx.showToast({
title: '当前剩余积分不足,请重新挑选',
icon:'none'
icon: 'none'
})
return
}
... ... @@ -58,7 +58,7 @@ Page({
}
}
if (num<1) {
if (num < 1) {
coudan.forEach((item, index) => {
if (item.id == id) {
coudan.splice(index, 1)
... ... @@ -66,7 +66,7 @@ Page({
}
})
} else {
if(type==1&&num==1){
if (type == 1 && num == 1) {
//选中
coudan.push({
id: id,
... ... @@ -76,9 +76,9 @@ Page({
id: id,
num: num,
price: Number(price),
price2:Number(price2)
price2: Number(price2)
})
}else{
} else {
coudan.forEach((item, index) => {
if (item.id == id) {
item.num = num
... ... @@ -104,19 +104,19 @@ Page({
for (let obj of coudan_arr) {
console.log(obj)
console.log(obj.price2)
if (obj.price2!= null) {
if (obj.price2 != null) {
console.log(111)
choudan_money = (obj.price2 * 100 * obj.num) / 100 + choudan_money
} else {
console.log(222)
choudan_money = (obj.price * 100 * obj.num) / 100 + choudan_money
}
num = num+obj.num
num = num + obj.num
}
this.setData({
choudan_money: choudan_money*100,
choudanNum:num,
choudan_money: choudan_money * 100,
choudanNum: num,
'info.choudan': this.data.info.syjf - choudan_money
// choudan_money: Math.floor(choudan_money* 100) / 100
})
... ... @@ -183,7 +183,7 @@ Page({
id: id,
num: num,
price: Number(price),
price2:Number(price2)
price2: Number(price2)
})
}
that.setData({
... ... @@ -213,12 +213,9 @@ Page({
that.setData({
info: res.msg,
total:total
total: total
})
console.log('9988756', that.data.info)
})
},
... ... @@ -233,7 +230,7 @@ Page({
}
app.post(url, params).then((res) => {
that.setData({
"info.yunfei": Number(res.msg.yunfei)*100
"info.yunfei": Number(res.msg.yunfei) * 100
})
})
},
... ... @@ -276,35 +273,64 @@ Page({
})
},
//订单支付
//开放订单支付
order_pay(order_odd) {
let that = this;
let url = app.interface.order_pay
let params = {
order_odd: order_odd
}
app.post(url, params).then((res) => {
this.setData({
order: res.msg
that.payment(res.msg)
})
if (res.msg.message == "支付成功") {
// wx.showToast({
// title: '购买成功',
// icon:'none'
// })
this.setData({
success: true
})
} else if (res.msg.message == "余额不足") {
this.setData({
fail: true
},
payment(res) {
var timeStamp = res.timeStamp.toString();
wx.requestPayment({
timeStamp: timeStamp,
nonceStr: res.nonceStr,
package: res.package,
signType: res.signType,
paySign: res.paySign,
success: function (res) {
wx.redirectTo({
url: '/packageA/pages/order/order_list/order_list?status=3',
})
},
fail: function (res) {
console.log(res);
}
})
},
//订单支付
// order_pay(order_odd) {
// let url = app.interface.order_pay
// let params = {
// order_odd: order_odd
// }
// app.post(url, params).then((res) => {
// this.setData({
// order: res.msg
// })
// if (res.msg.message == "支付成功") {
// // wx.showToast({
// // title: '购买成功',
// // icon:'none'
// // })
// this.setData({
// success: true
// })
// } else if (res.msg.message == "余额不足") {
// this.setData({
// fail: true
// })
// }
// })
// },
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
onLoad: function (options) {
console.log(options)
this.setData({
type: options.type,
... ... @@ -317,22 +343,19 @@ Page({
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function() {
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
onShow: function () {
let pages = getCurrentPages();
let currPage = pages[pages.length - 1]
console.log('887766554',currPage.data.id)
if (currPage.data.id) {
console.log('4778785',this.data.info)
this.setData({
"info.address.address": currPage.data.address,
"info.address.area": currPage.data.area,
... ... @@ -340,8 +363,6 @@ Page({
"info.address.tel": currPage.data.tel,
"info.address.name": currPage.data.name
})
console.log(this.data.info)
console.log(currPage.data.address)
this.get_youfei(currPage.data.id)
}
// if (wx.getStorageSync('no_address')) {
... ... @@ -356,35 +377,35 @@ Page({
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function() {
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function() {
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function() {
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function() {
onShareAppMessage: function () {
}
})
\ No newline at end of file
... ...
... ... @@ -63,10 +63,10 @@
<view class='score'>{{info.date}}</view>
</view>
<view class='mask_two'>
<!-- <view class='mask_two'>
<view>邮费</view>
<view class='score' style="color:rgba(242, 0, 0, 1)">{{info.yunfei/100}}积分</view>
</view>
</view> -->
</view>
</view>
</view>
... ... @@ -75,7 +75,8 @@
<view class="submit" catchtap="show_cover">提交</view>
<view class="jifen"> 合计:
<!-- <text>{{choudan_money?choudan_money + info.total + info.yunfei*100/100: info.total + info.yunfei*100/100}}积分</text> -->
<text>{{choudan_money?(choudan_money + info.total + info.yunfei)/100: (info.total + info.yunfei)/100}}积分</text>
<!-- <text>{{choudan_money?(choudan_money + info.total + info.yunfei)/100: (info.total + info.yunfei)/100}}积分</text> -->
<text>¥{{choudan_money?(choudan_money + info.total + info.yunfei)/100: (info.total + info.yunfei)/100}}</text>
</view>
<view class="num">共{{info.totalnum + choudanNum}}件</view>
</view>
... ... @@ -109,15 +110,17 @@
<view class="cover_box" wx:if="{{cover_type}}">
<view class="cover_order">
<view class="all_money">{{choudan_money?(choudan_money + info.total + info.yunfei)/100: (info.total + info.yunfei)/100}}积分</view>
<!-- <view class="all_money">{{choudan_money?(choudan_money + info.total + info.yunfei)/100: (info.total + info.yunfei)/100}}积分</view> -->
<view class="all_money">¥{{choudan_money?(choudan_money + info.total + info.yunfei)/100: (info.total + info.yunfei)/100}}</view>
<view class="money_item">
<text>商品积分</text>
<text>{{choudan_money?(choudan_money + info.total)/100:info.total/100}}积分</text>
<text>商品价格</text>
<!-- <text>{{choudan_money?(choudan_money + info.total)/100:info.total/100}}积分</text> -->
<text>¥{{choudan_money?(choudan_money + info.total)/100:info.total/100}}</text>
</view>
<view class="money_item">
<!-- <view class="money_item">
<text>邮费</text>
<text>{{info.yunfei/100}}积分</text>
</view>
</view> -->
<view class="cover_submit" catchtap="submit">确认支付</view>
<image src="/images/close.png" class="cover_close" catchtap="show_cover" />
</view>
... ...
... ... @@ -24,8 +24,8 @@
<view class="word">{{item.product_name}}</view>
<view class="info">
<view class="jifen">
<view class="name">积分</view>
<text>{{item.product_money}}</text>
<!-- <view class="name">积分</view> -->
<text>¥{{item.product_money}}</text>
<text style="margin-left: 10rpx;color:#ccc;font-size: 28rpx;">X{{item.num}}</text>
</view>
</view>
... ... @@ -36,8 +36,8 @@
<view class="info_box" wx:if="{{type == 3}}">
<view class="f_item">
<view class="shop">
商品积分
<text>{{item.price*100*item.num/100}}积分</text>
商品价格
<text>¥{{item.price*100*item.num/100}}</text>
</view>
</view>
</view>
... ... @@ -58,10 +58,10 @@
<view class='score'>{{info.status_text}}</view>
</view>
<view class='mask_two'>
<!-- <view class='mask_two'>
<view>邮费</view>
<view class='score' style="color:rgba(242, 0, 0, 1)">{{info.youfei}}积分</view>
</view>
</view> -->
</view>
</view>
... ... @@ -71,7 +71,7 @@
<view class="footer" wx:if="{{type==2}}">
<view class="submit" catchtap="show_cover">提交</view>
<view class="jifen"> 合计:
<text>{{info.money}}积分</text>
<text>¥{{info.money}}</text>
</view>
<view class="num">共{{info.total_num}}件</view>
</view>
... ... @@ -109,15 +109,15 @@
<view class="cover_box" wx:if="{{cover_type}}">
<view class="cover_order">
<view class="all_money">{{info.total_price + info.youfei*100/100}}积分</view>
<view class="all_money">¥{{info.total_price + info.youfei*100/100}}</view>
<view class="money_item">
<text>商品积分</text>
<text>{{info.total_price}}积分</text>
<text>商品价格</text>
<text>¥{{info.total_price}}</text>
</view>
<view class="money_item">
<!-- <view class="money_item">
<text>邮费</text>
<text>{{info.youfei}}积分</text>
</view>
</view> -->
<view class="cover_submit" catchtap="order_pay" data-order="{{info.order_odd}}">确认支付</view>
<image src="/images/close.png" class="cover_close" catchtap="show_cover" />
</view>
... ...
... ... @@ -14,14 +14,14 @@ Page({
success: [],
tui: [],
cover_type: false,
totalmoney:""
totalmoney: ""
},
// 展示待支付的去支付弹窗
show_cover(e) {
if( a.globalData.status==0){
if (a.globalData.status == 0) {
wx.showToast({
title: '您已您所在单位暂未开始劳保购买!',
icon:'none'
icon: 'none'
})
return false
}
... ... @@ -31,9 +31,8 @@ Page({
this.setData({
info: daiorder[index]
})
console.log(this.data.info)
this.setData({
totalmoney: Number(this.data.info.total_price)+Number(this.data.info.youfei)
totalmoney: Number(this.data.info.total_price) + Number(this.data.info.youfei)
})
}
this.setData({
... ... @@ -48,18 +47,18 @@ Page({
},
//查看订单详情
orderagain(e) {
let item=e.currentTarget.dataset.item;
let num=e.currentTarget.dataset.num;
let goodid=[]
item.forEach(function(value,index,array){
let item = e.currentTarget.dataset.item;
let num = e.currentTarget.dataset.num;
let goodid = []
item.forEach(function (value, index, array) {
goodid.push(value.id)
})
let id=e.currentTarget.dataset.id;
let id = e.currentTarget.dataset.id;
let that = this
let url = '/shop/recur_order'
let params = {
order_id:id
order_id: id
}
a.post(url, params).then((res) => {
// that.setData({
... ... @@ -95,7 +94,7 @@ Page({
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
onLoad: function (options) {
this.setData({
status: options.type
})
... ... @@ -119,7 +118,7 @@ Page({
style: status > 0 ? (status > 1 ? (status > 2 ? (status > 3 ? 'tui' : 'success') : 'daishouhuoorder') : 'daifahuoorder') : 'daiorder'
}
a.post(url, params).then((r) => {
}).catch((er) => {})
}).catch((er) => { })
},
// 获取订单列表
getListFun() {
... ... @@ -135,7 +134,7 @@ Page({
tui: r.msg.tui,
})
}
}).catch((er) => {})
}).catch((er) => { })
},
// 支付订单
... ... @@ -149,17 +148,42 @@ Page({
this.setData({
cover_type: false
})
if (r.code == 200) {
wx.showToast({
title: r.msg.message,
icon: r.msg.message == '支付成功"' ? 'success' : 'none',
duration: 1300
t.payment(r.msg)
// if (r.code == 200) {
// wx.showToast({
// title: r.msg.message,
// icon: r.msg.message == '支付成功"' ? 'success' : 'none',
// duration: 1300
// })
// setTimeout(() => {
// t.getListFun()
// }, 1300)
// }
}).catch((er) => { })
},
payment(res) {
let that = this;
var timeStamp = res.timeStamp.toString();
wx.requestPayment({
timeStamp: timeStamp,
nonceStr: res.nonceStr,
package: res.package,
signType: res.signType,
paySign: res.paySign,
success: function (res) {
console.log(res)
that.setData({
page: 1,
daiorder: [],
cover_type: false
})
setTimeout(() => {
t.getListFun()
}, 1300)
that.getListFun()
},
fail: function (res) {
console.log(res);
}
}).catch((er) => {})
})
},
// 取消订单
... ... @@ -180,7 +204,7 @@ Page({
t.getListFun()
}, 1300)
}
}).catch((er) => {})
}).catch((er) => { })
},
// 确认收货
... ... @@ -201,7 +225,7 @@ Page({
t.getListFun()
}, 1300)
}
}).catch((er) => {})
}).catch((er) => { })
},
//删除订单
delete_item(e) {
... ... @@ -219,7 +243,7 @@ Page({
})
t.getListFun()
}
}).catch((er) => {})
}).catch((er) => { })
},
// 退换货跳转页面详情
jumpReturnFun(e) {
... ... @@ -231,49 +255,49 @@ Page({
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function() {
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
onShow: function () {
this.getListFun();
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function() {
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function() {
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function() {
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function() {
onShareAppMessage: function () {
}
})
\ No newline at end of file
... ...
... ... @@ -17,8 +17,8 @@
<view class='info_titles'>{{zitem.product_name}}</view>
<view class='two_ones'>
<view class='scores'>积分</view>
<view class='prices'>{{zitem.product_money}}</view>
<!-- <view class='scores'>积分</view> -->
<view class='prices'>¥{{zitem.product_money}}</view>
<view class='prices' style="margin-left: 10rpx;color:#ccc;font-size: 28rpx;">X{{zitem.num}}</view>
</view>
</view>
... ... @@ -44,13 +44,13 @@
<view class='mask_two'>
<view>商品积分</view>
<view class='score'>{{item.total_price*100/100}}积分</view>
<view>商品价格</view>
<view class='score'>¥{{item.total_price*100/100}}</view>
</view>
<view class='mask_two no_border'>
<!-- <view class='mask_two no_border'>
<view>邮费积分</view>
<view class='score'>{{item.youfei}}积分</view>
</view>
</view> -->
</view>
<view class='btn_box'>
<!-- <view class='go_pay' data-d="{{item.order_odd}}" catchtap="payFun">去支付</view> -->
... ... @@ -76,8 +76,8 @@
<view class='img_right'>
<view class='info_titles'>{{zitem.product_name}}</view>
<view class='two_ones'>
<view class='scores'>积分</view>
<view class='prices'>{{zitem.product_money}}</view>
<!-- <view class='scores'>积分</view> -->
<view class='prices'>¥{{zitem.product_money}}</view>
<view class='prices' style="margin-left: 10rpx;color:#ccc;font-size: 28rpx;">X{{zitem.num}}</view>
</view>
</view>
... ... @@ -87,8 +87,8 @@
<view class='mask_two no_border'>
<view class='scorea' decode='{{true}}'>共{{item.total_num}}件商品
<text decode='{{true}}'>&emsp;实付:</text>
<text class='red_score'> {{item.total_price*100/100 + (item.youfei*100)/100}}</text>
<text class='small_red_score'>积分</text>
<text class='red_score'>¥ {{item.total_price*100/100 + (item.youfei*100)/100}}</text>
<!-- <text class='small_red_score'>积分</text> -->
</view>
</view>
... ... @@ -110,13 +110,13 @@
</view>
<view class='mask_two'>
<view>商品积分</view>
<view class='score'>{{item.total_price*100/100}}积分</view>
<view>商品价格</view>
<view class='score'>¥{{item.total_price*100/100}}</view>
</view>
<view class='mask_two no_border'>
<!-- <view class='mask_two no_border'>
<view>邮费积分</view>
<view class='score'>{{item.youfei}}积分</view>
</view>
</view> -->
<view class='btn_box'>
<view class='go_pay' data-d="{{item.order_odd}}" data-t="2" bindtap="orderagain" data-id="{{item.id}}" data-type="2" data-item="{{item.orderitem}}" data-num="{{item.total_num}}">再来一单</view>
<view class='cancel_order' data-d="{{item.order_odd}}" data-t="1" bindtap="jumpReturnFun">退货</view>
... ... @@ -146,8 +146,8 @@
<view class="address">收电话:</view> -->
<view class='two_ones'>
<view class='scores'>积分</view>
<view class='prices'>{{zitem.product_money}}</view>
<!-- <view class='scores'>积分</view> -->
<view class='prices'>¥{{zitem.product_money}}</view>
<view class='prices' style="margin-left: 10rpx;color:#ccc;font-size: 28rpx;">X{{zitem.num}}</view>
</view>
</view>
... ... @@ -172,19 +172,19 @@
</view>
<view class='mask_two'>
<view>商品积分</view>
<view class='score'>{{item.total_price*100/100}}积分</view>
<view>商品价格</view>
<view class='score'>¥{{item.total_price*100/100}}</view>
</view>
<view class='mask_two no_border'>
<!-- <view class='mask_two no_border'>
<view>邮费积分</view>
<view class='score'>{{item.youfei}}积分</view>
</view>
</view> -->
<view class='mask_two no_border'>
<view class='scorea' decode='{{true}}'>共{{item.total_num}}件商品
<text decode='{{true}}'>&emsp;实付:</text>
<text class='red_score'> {{item.total_price*100/100 + (item.youfei*100)/100}}</text>
<text class='small_red_score'>积分</text>
<text class='red_score'> ¥{{item.total_price*100/100 + (item.youfei*100)/100}}</text>
<!-- <text class='small_red_score'>积分</text> -->
</view>
</view>
<view class='btn_box'>
... ... @@ -215,8 +215,8 @@
<view class='two_ones'>
<view class='scores'>积分</view>
<view class='prices'>{{zitem.product_money}}</view>
<!-- <view class='scores'>积分</view> -->
<view class='prices'>¥{{zitem.product_money}}</view>
<view class='prices' style="margin-left: 10rpx;color:#ccc;font-size: 28rpx;">X{{zitem.num}}</view>
</view>
</view>
... ... @@ -241,19 +241,19 @@
</view>
<view class='mask_two'>
<view>商品积分</view>
<view class='score'>{{item.total_price*100/100}}积分</view>
<view>商品价格</view>
<view class='score'>¥{{item.total_price*100/100}}</view>
</view>
<view class='mask_two no_border'>
<!-- <view class='mask_two no_border'>
<view>邮费积分</view>
<view class='score'>{{item.youfei}}积分</view>
</view>
</view> -->
<view class='mask_two no_border'>
<view class='scorea' decode='{{true}}'>共{{item.total_num}}件商品
<text decode='{{true}}'>&emsp;实付:</text>
<text class='red_score'> {{item.total_price*100/100 + (item.youfei*100)/100}}</text>
<text class='small_red_score'>积分</text>
<text class='red_score'>¥ {{item.total_price*100/100 + (item.youfei*100)/100}}</text>
<!-- <text class='small_red_score'>积分</text> -->
</view>
</view>
... ... @@ -284,8 +284,8 @@
<view class='two_ones'>
<view class='scores'>积分</view>
<view class='prices'>{{zitem.product_money}}</view>
<!-- <view class='scores'>积分</view> -->
<view class='prices'>¥{{zitem.product_money}}</view>
<view class='prices' style="margin-left: 10rpx;color:#ccc;font-size: 28rpx;">X{{zitem.num}}</view>
</view>
</view>
... ... @@ -309,19 +309,19 @@
</view>
<view class='mask_two'>
<view>商品积分</view>
<view class='score'>{{item.total_price*100/100}}积分</view>
<view>商品价格</view>
<view class='score'>¥{{item.total_price*100/100}}</view>
</view>
<view class='mask_two no_border'>
<!-- <view class='mask_two no_border'>
<view>邮费积分</view>
<view class='score'>{{item.youfei}}积分</view>
</view>
</view> -->
<view class='mask_two no_border'>
<view class='scorea' decode='{{true}}'>共{{item.total_num}}件商品
<text decode='{{true}}'>&emsp;实付:</text>
<text class='red_score'> {{item.total_price*1000/1000 + (item.youfei*1000)/1000}}</text>
<text class='small_red_score'>积分</text>
<text class='red_score'>¥ {{item.total_price*1000/1000 + (item.youfei*1000)/1000}}</text>
<!-- <text class='small_red_score'>积分</text> -->
</view>
</view>
<view class='btn_box'>
... ... @@ -341,15 +341,15 @@
<!-- 待支付订单的支付弹窗 -->
<view class="cover_box" wx:if="{{cover_type}}">
<view class="cover_order">
<view class="all_money">{{totalmoney}}积分</view>
<view class="all_money">¥{{totalmoney}}</view>
<view class="money_item">
<text>商品积分</text>
<text>{{info.total_price}}积分</text>
<text>商品价格</text>
<text>¥{{info.total_price}}</text>
</view>
<view class="money_item">
<!-- <view class="money_item">
<text>邮费</text>
<text>{{info.youfei}}积分</text>
</view>
</view> -->
<view class="cover_submit" data-d="{{info.order_odd}}" catchtap="payFun">确认支付</view>
<image src="/images/close.png" class="cover_close" catchtap="show_cover" />
</view>
... ...
... ... @@ -93,12 +93,12 @@
</view>
<view class='mask_twos'>
<view class='mask_two'>
<view>退还总积分</view>
<view class='score'>{{detail.order.total_price + detail.order.youfei*100/100}}积分</view>
<view>退还总金额</view>
<view class='score'>¥{{detail.order.total_price + detail.order.youfei*100/100}}</view>
</view>
<view class='mask_two'>
<view>退回账户</view>
<view class='score'>{{detail.status == 1?detail.order.total_price + detail.order.youfei*100/100:0}}积分</view>
<view class='score'>¥{{detail.status == 1?detail.order.total_price + detail.order.youfei*100/100:0}}</view>
</view>
</view>
<!-- 退款失败结束 -->
... ... @@ -130,8 +130,8 @@
<view class='score'>{{detail.cause}}</view>
</view>
<view class='mask_two'>
<view>退款积分</view>
<view class='score'>{{detail.order.total_price + detail.order.youfei*100/100}}积分</view>
<view>退款金额</view>
<view class='score'>¥{{detail.order.total_price + detail.order.youfei*100/100}}</view>
</view>
</view>
</view>
... ...
... ... @@ -2,9 +2,9 @@
<navigator class="no_login" catchtap="go_login" url="/pages/register/register" hover-class="none">请先登录</navigator>
</block>
<block wx:elif="{{login_new==''}}">
<!-- <block wx:elif="{{login_new==''}}">
<navigator class="no_login" catchtap="go_login" url="/pages/login/login" hover-class="none">请先绑定后操作,点击绑定</navigator>
</block>
</block> -->
<block wx:else>
... ... @@ -21,7 +21,8 @@
</view>
<view class="tips_info">
<text>不含运费</text>合计
<text>{{integral}}积分</text>
<!-- 2023-10-19 需求要将积分改为微信支付的金额 -->
<text>¥{{integral}}</text>
</view>
<view class="submit" bindtap="submit">结算({{all_num}})</view>
</view>
... ...
<import src="/wxParse/wxParse.wxml" />
<view class='page{{mask?" active":""}}'>
<concat/>
<concat />
<view class='top'>
<view class='current_box'>{{current+1}}/{{info.images.length}}</view>
<swiper class='swiper' current='{{current}}' bindchange='getCurrent'>
... ... @@ -12,8 +12,9 @@
</view>
<view class='two'>
<view class='two_one'>
<view class='score'>积分</view>
<view class='price'>{{info.price2==null?info.price:info.price2}}</view>
<!-- 2023-10-19 需求要将积分改为微信支付的金额 -->
<!-- <view class='score'>积分</view> -->
<view class='price'>¥{{info.price2==null?info.price:info.price2}}</view>
</view>
<!-- <view class="oldprice" wx:if="{{info.price2!=null}}">{{info.price}}</view> -->
... ... @@ -66,16 +67,18 @@
<view class='info_title'>{{info.name}}</view>
<view wx:if="{{info.price2!=null}}">
<view class='two_ones'>
<view class='scores'>积分</view>
<view class='prices'>{{info.price2}}</view>
<!-- 2023-10-19 需求要将积分改为微信支付的金额 -->
<!-- <view class='scores'>积分</view> -->
<view class='prices'>¥{{info.price2}}</view>
</view>
<!-- <view class="oldprice">{{info.price}}</view> -->
</view>
<view class='two_ones' wx:else>
<view class='scores'>积分</view>
<view class='prices'>{{info.price}}</view>
<!-- 2023-10-19 需求要将积分改为微信支付的金额 -->
<!-- <view class='scores'>积分</view> -->
<view class='prices'>¥{{info.price}}</view>
</view>
</view>
</view>
... ...
... ... @@ -34,7 +34,7 @@ Page({
pid: '',
logok: '',
selected: 0,
tel:'',
tel: '',
list: [{
pagePath: "/pages/index/index",
text: "商品",
... ... @@ -231,18 +231,21 @@ Page({
let token = wx.getStorageSync('token');
let cb_login = wx.getStorageSync('cb_login');
let sq = wx.getStorageSync('cb_sq')
console.log(token)
if (token == '' || sq == 2) {
console.log(token,'=================')
wx.navigateTo({
url: '/packageA/pages/index/index?token=' + token,
})
// if (token == '' || sq == 2) {
// wx.showLoading({
// title: '模块加载中',
// })
// setTimeout(function () {
wx.navigateTo({
url: '/pages/register/register',
})
// wx.navigateTo({
// url: '/pages/register/register',
// })
// }, 1000)
} else {
if (cb_login == 1) {
// } else {
// if (cb_login == 1) {
// wx.showLoading({
// title: '模块加载中',
// })
... ... @@ -251,23 +254,22 @@ Page({
// title: '加载中',
// duration: 1200
// })
wx.navigateTo({
url: '/packageA/pages/index/index',
})
// wx.navigateTo({
// url: '/packageA/pages/index/index',
// })
// },1000)
} else {
// } else {
// wx.showLoading({
// title: '加载中',
// mask: true
// })
// setTimeout(()=>{
wx.navigateTo({
url: '/pages/login/login',
})
// wx.navigateTo({
// url: '/pages/login/login',
// })
// },1000)
}
}
// }
// }
},
// 进入差旅
... ... @@ -356,7 +358,7 @@ Page({
},
onReady(){
onReady() {
this.setData({
tel: wx.getStorageSync('tel')
})
... ... @@ -478,7 +480,7 @@ Page({
status1: r.msg.status1,
status2: r.msg.status2,
title2: r.msg.title2,
tel:r.msg.tel
tel: r.msg.tel
})
wx.setStorageSync('tel', r.msg.tel)
... ...
... ... @@ -35,11 +35,9 @@ Page({
if(that.data.iv){
that.get_token()
}
}
})
}
}
})
}
... ... @@ -63,10 +61,7 @@ Page({
that.get_token()
}
})
}
}
},
... ...
... ... @@ -41,7 +41,8 @@
"minifyWXML": true,
"showES6CompileOption": false,
"useCompilerPlugins": false,
"ignoreUploadUnusedFiles": true
"ignoreUploadUnusedFiles": true,
"condition": false
},
"compileType": "miniprogram",
"libVersion": "2.22.0",
... ...
... ... @@ -5,24 +5,6 @@
"miniprogram": {
"list": [
{
"name": "123",
"pathName": "pages/login/login",
"query": "",
"scene": null
},
{
"name": "pages/shop_detail/shop_detail",
"pathName": "pages/order/order",
"query": "",
"scene": null
},
{
"name": "公众号模拟",
"pathName": "pages/register/register",
"query": "",
"scene": 1058
},
{
"name": "自定义菜单",
"pathName": "pages/register/register",
"query": "",
... ... @@ -32,95 +14,10 @@
}
},
{
"name": "个人中心",
"pathName": "pages/my/my",
"query": "",
"scene": null
},
{
"name": "商品列表",
"pathName": "pages/classify/classify",
"query": "",
"scene": null
},
{
"name": "活动套餐",
"pathName": "pages/search/search_result/search_result",
"query": "",
"scene": null
},
{
"name": "足迹",
"pathName": "pages/zuji/zuji",
"query": "",
"scene": null
},
{
"name": "首页",
"pathName": "pages/index/index",
"query": "",
"scene": null
},
{
"name": "注册",
"pathName": "pages/register/register",
"query": "",
"scene": null
},
{
"name": "pages/shop_detail/shop_detail",
"pathName": "pages/shop_detail/shop_detail",
"query": "id=774",
"scene": null
},
{
"name": "pages/classify/classify",
"pathName": "pages/classify/classify",
"query": "",
"scene": null
},
{
"name": "pages/classify/classify",
"pathName": "pages/classify/classify",
"query": "",
"scene": null
},
{
"name": "确定顶",
"pathName": "pages/order/order",
"query": "type=3&info={\"shop_id\":12,\"num\":1}&id=12",
"scene": null
},
{
"name": "pages/shop_cart/shop_cart",
"pathName": "pages/shop_cart/shop_cart",
"query": "",
"scene": null
},
{
"name": "packageA/pages/index/index",
"pathName": "packageA/pages/index/index",
"query": "",
"scene": null
},
{
"name": "确认订单",
"pathName": "packageA/pages/order/order",
"query": "type=3&info={\"shop_id\":3232,\"num\":1}&id=3232",
"scene": null
},
{
"name": "packageA/pages/logistics/logistics",
"pathName": "packageA/pages/logistics/logistics",
"query": "order=K7J527500103601",
"scene": null
},
{
"name": "快递详情",
"pathName": "packageA/pages/logistics/logistics",
"query": "order=LBLAY890707802979",
"launchMode": "default",
"scene": null
}
]
}
... ...