订单准备修改-803
parent
9abedc3f2e
commit
fede9f4949
32
App.vue
32
App.vue
|
@ -6,38 +6,6 @@
|
||||||
lng:'' ,// 公司地址经度
|
lng:'' ,// 公司地址经度
|
||||||
hostapi:'https://laonon.scdxtc.cn' // 域名配置
|
hostapi:'https://laonon.scdxtc.cn' // 域名配置
|
||||||
},
|
},
|
||||||
// 优先于show方法
|
|
||||||
onLaunch: function() {
|
|
||||||
uni.login({
|
|
||||||
success: (res) => {
|
|
||||||
uni.request({
|
|
||||||
url: this.globalData.hostapi +'/api/user/login',
|
|
||||||
data:{code:res.code},
|
|
||||||
success: (result) => {
|
|
||||||
console.log(result,'登录信息')
|
|
||||||
if(result.data.code == 0) {
|
|
||||||
uni.setStorageSync('userId',result.data.account_id);
|
|
||||||
uni.setStorageSync('token',result.data.data.token);//缓存token
|
|
||||||
uni.setStorageSync('openid',result.data.data.openid);//缓存openid
|
|
||||||
uni.setStorageSync('expire',result.data.data.expire);//缓存失效时间(时间戳格式)
|
|
||||||
uni.setStorageSync('phone_active',result.data.data.phone_active);//是否授权手机号
|
|
||||||
uni.setStorageSync('is_active',result.data.data.is_active);//是否授权头像和昵称
|
|
||||||
uni.setStorageSync('invite_code',result.data.data.invite_code);//缓存邀请码
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
})
|
|
||||||
},
|
|
||||||
onShow: function() {
|
|
||||||
|
|
||||||
},
|
|
||||||
onHide: function() {
|
|
||||||
|
|
||||||
},
|
|
||||||
methods:{
|
|
||||||
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
|
@ -20,30 +20,10 @@ const refreshTokenPage = () => {
|
||||||
param += '?' + key + '=' + currentParam[key]
|
param += '?' + key + '=' + currentParam[key]
|
||||||
}
|
}
|
||||||
let localRoute = '/'+ currentRoute + param;
|
let localRoute = '/'+ currentRoute + param;
|
||||||
if(localRoute !== '/pages/login/login'){
|
uni.setStorageSync('page-path-options',routeParam);
|
||||||
uni.login({
|
uni.navigateTo({
|
||||||
success: (res) => {
|
url: '/pages/login/login'
|
||||||
uni.request({
|
})
|
||||||
url:'https://laonon.scdxtc.cn/api/user/login',
|
|
||||||
data:{code:res.code},
|
|
||||||
success: (result) => {
|
|
||||||
if(result.data.code == 0) {
|
|
||||||
uni.setStorageSync('userId',result.data.account_id);
|
|
||||||
uni.setStorageSync('token',result.data.data.token);//缓存token
|
|
||||||
uni.setStorageSync('openid',result.data.data.openid);//缓存openid
|
|
||||||
uni.setStorageSync('expire',result.data.data.expire);//缓存失效时间(时间戳格式)
|
|
||||||
uni.setStorageSync('phone_active',result.data.data.phone_active);//是否授权手机号
|
|
||||||
uni.setStorageSync('is_active',result.data.data.is_active);//是否授权头像和昵称
|
|
||||||
uni.setStorageSync('invite_code',result.data.data.invite_code);//缓存邀请码
|
|
||||||
uni.reLaunch({ // 重新进入当前页面
|
|
||||||
url:localRoute
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
flag = true;
|
flag = true;
|
||||||
}
|
}
|
||||||
// 请求错误处理
|
// 请求错误处理
|
||||||
|
|
|
@ -385,7 +385,7 @@ const tools = {
|
||||||
judgeAuth(){
|
judgeAuth(){
|
||||||
let auth = false;
|
let auth = false;
|
||||||
clearTimeout(this.authTimer);
|
clearTimeout(this.authTimer);
|
||||||
if(!uni.getStorageSync('token') || uni.getStorageSync('is_active') == 0) {
|
if(!uni.getStorageSync('token')) {
|
||||||
this.showToast('请授权登录');
|
this.showToast('请授权登录');
|
||||||
this.authTimer = setTimeout(()=>{
|
this.authTimer = setTimeout(()=>{
|
||||||
uni.reLaunch({url:'/pages/login/login'});
|
uni.reLaunch({url:'/pages/login/login'});
|
||||||
|
|
6
main.js
6
main.js
|
@ -22,9 +22,9 @@ Vue.prototype.$requst = requst;
|
||||||
Vue.prototype.$hostHttp = 'https://laonon.scdxtc.cn';
|
Vue.prototype.$hostHttp = 'https://laonon.scdxtc.cn';
|
||||||
|
|
||||||
//不显示console.log
|
//不显示console.log
|
||||||
if (uni.getSystemInfoSync().platform !== "devtools") {
|
// if (uni.getSystemInfoSync().platform !== "devtools") {
|
||||||
console.log = () => {}
|
// console.log = () => {}
|
||||||
}
|
// }
|
||||||
|
|
||||||
App.mpType = 'app';
|
App.mpType = 'app';
|
||||||
|
|
||||||
|
|
|
@ -89,11 +89,11 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="item flex">
|
<view class="item flex">
|
||||||
<label class="radio" @tap="priceCheck=!priceCheck">
|
<label class="radio" @tap="priceCheck=!priceCheck">
|
||||||
<radio :checked="priceCheck" color="#febf00" :disabled="orderInfo.available_balance>0?false:true" v-if="orderInfo.available_balance>0"/>
|
<radio :checked="priceCheck" color="#febf00" :disabled="orderInfo.available_balance>0?false:true"/>
|
||||||
<text>余额支付</text>
|
<text>余额支付</text>
|
||||||
</label>
|
</label>
|
||||||
<view class="txt flex">
|
<view class="txt flex">
|
||||||
<view class="color-66">{{orderInfo.available_balance}}</view>
|
<view class="color-66">{{parseFloat(orderInfo.available_balance)>0?orderInfo.available_balance:0}}</view>
|
||||||
<view class="btn"></view>
|
<view class="btn"></view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
@ -161,6 +161,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onShow() {
|
onShow() {
|
||||||
|
// 获取信息
|
||||||
this.getOrderInfo();
|
this.getOrderInfo();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
@ -277,7 +278,6 @@
|
||||||
if(scoreB<1){
|
if(scoreB<1){
|
||||||
this.checkedYes = false;
|
this.checkedYes = false;
|
||||||
}
|
}
|
||||||
console.log(this.checkedYes,1212121212)
|
|
||||||
|
|
||||||
// 地址信息
|
// 地址信息
|
||||||
let addr_id = uni.getStorageSync('addr_id');
|
let addr_id = uni.getStorageSync('addr_id');
|
||||||
|
@ -288,10 +288,15 @@
|
||||||
this.default_address = res.data.default_address;
|
this.default_address = res.data.default_address;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// 价格
|
// 价格
|
||||||
this.discountPrice = 0;
|
this.discountPrice = 0;
|
||||||
this.totalPrice = this.$toolAll.tools.addXiaoShu(this.orderInfo.total_price);
|
this.totalPrice = this.$toolAll.tools.addXiaoShu(this.orderInfo.total_price);
|
||||||
|
|
||||||
|
// 计算价格
|
||||||
|
if(this.vipCheck||this.couponCheck||this.scoreCheck){
|
||||||
|
// 计算价格
|
||||||
|
this.computePrice();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
uni.hideLoading();
|
uni.hideLoading();
|
||||||
this.isLoading = true;
|
this.isLoading = true;
|
||||||
|
|
|
@ -123,9 +123,14 @@
|
||||||
searchList:[], //搜索结果
|
searchList:[], //搜索结果
|
||||||
showSearch:false, //显示搜索结果
|
showSearch:false, //显示搜索结果
|
||||||
isLoading:false,
|
isLoading:false,
|
||||||
|
scollYes:true,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onLoad() {
|
onLoad(op) {
|
||||||
|
if(op.invite_code){
|
||||||
|
// 缓存invite_code
|
||||||
|
uni.setStorageSync('inviteCode',op.invite_code);
|
||||||
|
}
|
||||||
// 获取用户信息
|
// 获取用户信息
|
||||||
this.getUserInfo();
|
this.getUserInfo();
|
||||||
// 获取头部背景
|
// 获取头部背景
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
<text class="font24">我的优惠券</text>
|
<text class="font24">我的优惠券</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item" @tap="goPage('/pagesA/recharge/recharge')">
|
<view class="item" @tap="goPage('/pagesA/recharge/recharge')">
|
||||||
<view class="font48">{{userInfo.balance}}</view>
|
<view class="font48">{{parseFloat(userInfo.balance)>0?userInfo.balance:0}}</view>
|
||||||
<text class="font24">我的余额</text>
|
<text class="font24">我的余额</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
@ -171,14 +171,17 @@
|
||||||
this.myOrder[2].num = newArr.paid;
|
this.myOrder[2].num = newArr.paid;
|
||||||
this.myOrder[3].num = newArr.shipped;
|
this.myOrder[3].num = newArr.shipped;
|
||||||
this.myOrder[4].num = newArr.completed;
|
this.myOrder[4].num = newArr.completed;
|
||||||
if(this.vip_level!==0 && this.is_distributor !== 0){
|
if(this.vip_level!==0 && this.is_distributor!==0){
|
||||||
this.showObj='0234567'
|
this.showObj='0234567'
|
||||||
}
|
}
|
||||||
if(this.vip_level!==0 && this.is_distributor == 0){
|
if(this.vip_level!==0 && this.is_distributor==0){
|
||||||
this.showObj='023467'
|
this.showObj='023467'
|
||||||
}
|
}
|
||||||
if(this.vip_level==0 && this.is_distributor !== 0){
|
if(this.vip_level==0 && this.is_distributor!==0){
|
||||||
this.showObj='0123546'
|
this.showObj='01234567'
|
||||||
|
}
|
||||||
|
if(this.vip_level==0 && this.is_distributor==0){
|
||||||
|
this.showObj='0123467'
|
||||||
}
|
}
|
||||||
// 获取分销码
|
// 获取分销码
|
||||||
this.getCodeEv();
|
this.getCodeEv();
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -7,7 +7,7 @@
|
||||||
/***/ (function(module, exports, __webpack_require__) {
|
/***/ (function(module, exports, __webpack_require__) {
|
||||||
|
|
||||||
"use strict";
|
"use strict";
|
||||||
/* WEBPACK VAR INJECTION */(function(uni, createApp) {__webpack_require__(/*! uni-pages */ 5);
|
/* WEBPACK VAR INJECTION */(function(createApp) {__webpack_require__(/*! uni-pages */ 5);
|
||||||
|
|
||||||
var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 4));
|
var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 4));
|
||||||
var _App = _interopRequireDefault(__webpack_require__(/*! ./App */ 6));
|
var _App = _interopRequireDefault(__webpack_require__(/*! ./App */ 6));
|
||||||
|
@ -35,17 +35,17 @@ _vue.default.component('status-nav', statusNav); //全局注册头部组件
|
||||||
_vue.default.prototype.$toolAll = _tools.default; // 响应数据
|
_vue.default.prototype.$toolAll = _tools.default; // 响应数据
|
||||||
_vue.default.prototype.$requst = _requst.default; //公共域名
|
_vue.default.prototype.$requst = _requst.default; //公共域名
|
||||||
_vue.default.prototype.$hostHttp = 'https://laonon.scdxtc.cn'; //不显示console.log
|
_vue.default.prototype.$hostHttp = 'https://laonon.scdxtc.cn'; //不显示console.log
|
||||||
if (uni.getSystemInfoSync().platform !== "devtools") {console.log = function () {};}
|
// if (uni.getSystemInfoSync().platform !== "devtools") {
|
||||||
|
// console.log = () => {}
|
||||||
|
// }
|
||||||
_App.default.mpType = 'app';
|
_App.default.mpType = 'app';
|
||||||
|
|
||||||
var app = new _vue.default(_objectSpread({
|
var app = new _vue.default(_objectSpread({
|
||||||
store: _store.default },
|
store: _store.default },
|
||||||
_App.default));
|
_App.default));
|
||||||
|
|
||||||
|
|
||||||
createApp(app).$mount();
|
createApp(app).$mount();
|
||||||
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"], __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createApp"]))
|
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createApp"]))
|
||||||
|
|
||||||
/***/ }),
|
/***/ }),
|
||||||
/* 1 */,
|
/* 1 */,
|
||||||
|
@ -115,45 +115,14 @@ __webpack_require__.r(__webpack_exports__);
|
||||||
/***/ (function(module, exports, __webpack_require__) {
|
/***/ (function(module, exports, __webpack_require__) {
|
||||||
|
|
||||||
"use strict";
|
"use strict";
|
||||||
/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _default =
|
Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _default =
|
||||||
{
|
{
|
||||||
globalData: {
|
globalData: {
|
||||||
projectname: '', // 项目名称
|
projectname: '', // 项目名称
|
||||||
lat: '', // 公司地址维度
|
lat: '', // 公司地址维度
|
||||||
lng: '', // 公司地址经度
|
lng: '', // 公司地址经度
|
||||||
hostapi: 'https://laonon.scdxtc.cn' // 域名配置
|
hostapi: 'https://laonon.scdxtc.cn' // 域名配置
|
||||||
},
|
} };exports.default = _default;
|
||||||
// 优先于show方法
|
|
||||||
onLaunch: function onLaunch() {var _this = this;
|
|
||||||
uni.login({
|
|
||||||
success: function success(res) {
|
|
||||||
uni.request({
|
|
||||||
url: _this.globalData.hostapi + '/api/user/login',
|
|
||||||
data: { code: res.code },
|
|
||||||
success: function success(result) {
|
|
||||||
console.log(result, '登录信息');
|
|
||||||
if (result.data.code == 0) {
|
|
||||||
uni.setStorageSync('userId', result.data.account_id);
|
|
||||||
uni.setStorageSync('token', result.data.data.token); //缓存token
|
|
||||||
uni.setStorageSync('openid', result.data.data.openid); //缓存openid
|
|
||||||
uni.setStorageSync('expire', result.data.data.expire); //缓存失效时间(时间戳格式)
|
|
||||||
uni.setStorageSync('phone_active', result.data.data.phone_active); //是否授权手机号
|
|
||||||
uni.setStorageSync('is_active', result.data.data.is_active); //是否授权头像和昵称
|
|
||||||
uni.setStorageSync('invite_code', result.data.data.invite_code); //缓存邀请码
|
|
||||||
}
|
|
||||||
} });
|
|
||||||
|
|
||||||
} });
|
|
||||||
|
|
||||||
},
|
|
||||||
onShow: function onShow() {
|
|
||||||
|
|
||||||
},
|
|
||||||
onHide: function onHide() {
|
|
||||||
|
|
||||||
},
|
|
||||||
methods: {} };exports.default = _default;
|
|
||||||
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
|
|
||||||
|
|
||||||
/***/ }),
|
/***/ }),
|
||||||
/* 9 */
|
/* 9 */
|
||||||
|
|
|
@ -10,38 +10,6 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* 阿里巴巴矢量图标库 start */
|
/* 阿里巴巴矢量图标库 start */
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: "iconfont"; /* Project id 3180711 */
|
font-family: "iconfont"; /* Project id 3180711 */
|
||||||
|
|
|
@ -4487,7 +4487,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
|
||||||
judgeAuth: function judgeAuth() {
|
judgeAuth: function judgeAuth() {
|
||||||
var auth = false;
|
var auth = false;
|
||||||
clearTimeout(this.authTimer);
|
clearTimeout(this.authTimer);
|
||||||
if (!uni.getStorageSync('token') || uni.getStorageSync('is_active') == 0) {
|
if (!uni.getStorageSync('token')) {
|
||||||
this.showToast('请授权登录');
|
this.showToast('请授权登录');
|
||||||
this.authTimer = setTimeout(function () {
|
this.authTimer = setTimeout(function () {
|
||||||
uni.reLaunch({ url: '/pages/login/login' });
|
uni.reLaunch({ url: '/pages/login/login' });
|
||||||
|
@ -4760,30 +4760,10 @@ var refreshTokenPage = function refreshTokenPage() {
|
||||||
param += '?' + key + '=' + currentParam[key];
|
param += '?' + key + '=' + currentParam[key];
|
||||||
}
|
}
|
||||||
var localRoute = '/' + currentRoute + param;
|
var localRoute = '/' + currentRoute + param;
|
||||||
if (localRoute !== '/pages/login/login') {
|
uni.setStorageSync('page-path-options', routeParam);
|
||||||
uni.login({
|
uni.navigateTo({
|
||||||
success: function success(res) {
|
url: '/pages/login/login' });
|
||||||
uni.request({
|
|
||||||
url: 'https://laonon.scdxtc.cn/api/user/login',
|
|
||||||
data: { code: res.code },
|
|
||||||
success: function success(result) {
|
|
||||||
if (result.data.code == 0) {
|
|
||||||
uni.setStorageSync('userId', result.data.account_id);
|
|
||||||
uni.setStorageSync('token', result.data.data.token); //缓存token
|
|
||||||
uni.setStorageSync('openid', result.data.data.openid); //缓存openid
|
|
||||||
uni.setStorageSync('expire', result.data.data.expire); //缓存失效时间(时间戳格式)
|
|
||||||
uni.setStorageSync('phone_active', result.data.data.phone_active); //是否授权手机号
|
|
||||||
uni.setStorageSync('is_active', result.data.data.is_active); //是否授权头像和昵称
|
|
||||||
uni.setStorageSync('invite_code', result.data.data.invite_code); //缓存邀请码
|
|
||||||
uni.reLaunch({ // 重新进入当前页面
|
|
||||||
url: localRoute });
|
|
||||||
|
|
||||||
}
|
|
||||||
} });
|
|
||||||
|
|
||||||
} });
|
|
||||||
|
|
||||||
}
|
|
||||||
flag = true;
|
flag = true;
|
||||||
};
|
};
|
||||||
// 请求错误处理
|
// 请求错误处理
|
||||||
|
|
|
@ -120,20 +120,21 @@ var render = function() {
|
||||||
var _vm = this
|
var _vm = this
|
||||||
var _h = _vm.$createElement
|
var _h = _vm.$createElement
|
||||||
var _c = _vm._self._c || _h
|
var _c = _vm._self._c || _h
|
||||||
|
var m0 = _vm.isLoading ? parseFloat(_vm.orderInfo.available_balance) : null
|
||||||
var l0 = _vm.isLoading
|
var l0 = _vm.isLoading
|
||||||
? _vm.__map(_vm.couponList, function(item, index) {
|
? _vm.__map(_vm.couponList, function(item, index) {
|
||||||
var $orig = _vm.__get_orig(item)
|
var $orig = _vm.__get_orig(item)
|
||||||
|
|
||||||
var g0 = item.amount.split(".")
|
var g0 = item.amount.split(".")
|
||||||
var g1 = item.amount.split(".")
|
var g1 = item.amount.split(".")
|
||||||
var m0 = parseInt(item.condition)
|
var m1 = parseInt(item.condition)
|
||||||
var m1 = parseInt(item.amount)
|
var m2 = parseInt(item.amount)
|
||||||
return {
|
return {
|
||||||
$orig: $orig,
|
$orig: $orig,
|
||||||
g0: g0,
|
g0: g0,
|
||||||
g1: g1,
|
g1: g1,
|
||||||
m0: m0,
|
m1: m1,
|
||||||
m1: m1
|
m2: m2
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
: null
|
: null
|
||||||
|
@ -152,6 +153,7 @@ var render = function() {
|
||||||
{},
|
{},
|
||||||
{
|
{
|
||||||
$root: {
|
$root: {
|
||||||
|
m0: m0,
|
||||||
l0: l0
|
l0: l0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -352,6 +354,7 @@ var _default =
|
||||||
|
|
||||||
},
|
},
|
||||||
onShow: function onShow() {
|
onShow: function onShow() {
|
||||||
|
// 获取信息
|
||||||
this.getOrderInfo();
|
this.getOrderInfo();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
@ -468,7 +471,6 @@ var _default =
|
||||||
if (scoreB < 1) {
|
if (scoreB < 1) {
|
||||||
_this.checkedYes = false;
|
_this.checkedYes = false;
|
||||||
}
|
}
|
||||||
console.log(_this.checkedYes, 1212121212);
|
|
||||||
|
|
||||||
// 地址信息
|
// 地址信息
|
||||||
var addr_id = uni.getStorageSync('addr_id');
|
var addr_id = uni.getStorageSync('addr_id');
|
||||||
|
@ -479,10 +481,15 @@ var _default =
|
||||||
_this.default_address = res.data.default_address;
|
_this.default_address = res.data.default_address;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// 价格
|
// 价格
|
||||||
_this.discountPrice = 0;
|
_this.discountPrice = 0;
|
||||||
_this.totalPrice = _this.$toolAll.tools.addXiaoShu(_this.orderInfo.total_price);
|
_this.totalPrice = _this.$toolAll.tools.addXiaoShu(_this.orderInfo.total_price);
|
||||||
|
|
||||||
|
// 计算价格
|
||||||
|
if (_this.vipCheck || _this.couponCheck || _this.scoreCheck) {
|
||||||
|
// 计算价格
|
||||||
|
_this.computePrice();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
uni.hideLoading();
|
uni.hideLoading();
|
||||||
_this.isLoading = true;
|
_this.isLoading = true;
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -277,10 +277,15 @@ var _default = {
|
||||||
''), _defineProperty(_ref, "searchList",
|
''), _defineProperty(_ref, "searchList",
|
||||||
[]), _defineProperty(_ref, "showSearch",
|
[]), _defineProperty(_ref, "showSearch",
|
||||||
false), _defineProperty(_ref, "isLoading",
|
false), _defineProperty(_ref, "isLoading",
|
||||||
false), _ref;
|
false), _defineProperty(_ref, "scollYes",
|
||||||
|
true), _ref;
|
||||||
|
|
||||||
},
|
},
|
||||||
onLoad: function onLoad() {
|
onLoad: function onLoad(op) {
|
||||||
|
if (op.invite_code) {
|
||||||
|
// 缓存invite_code
|
||||||
|
uni.setStorageSync('inviteCode', op.invite_code);
|
||||||
|
}
|
||||||
// 获取用户信息
|
// 获取用户信息
|
||||||
this.getUserInfo();
|
this.getUserInfo();
|
||||||
// 获取头部背景
|
// 获取头部背景
|
||||||
|
|
|
@ -120,6 +120,7 @@ var render = function() {
|
||||||
var _vm = this
|
var _vm = this
|
||||||
var _h = _vm.$createElement
|
var _h = _vm.$createElement
|
||||||
var _c = _vm._self._c || _h
|
var _c = _vm._self._c || _h
|
||||||
|
var m0 = _vm.isLoading ? parseFloat(_vm.userInfo.balance) : null
|
||||||
var l0 = _vm.isLoading
|
var l0 = _vm.isLoading
|
||||||
? _vm.__map(_vm.myOrder, function(item, index) {
|
? _vm.__map(_vm.myOrder, function(item, index) {
|
||||||
var $orig = _vm.__get_orig(item)
|
var $orig = _vm.__get_orig(item)
|
||||||
|
@ -148,6 +149,7 @@ var render = function() {
|
||||||
{},
|
{},
|
||||||
{
|
{
|
||||||
$root: {
|
$root: {
|
||||||
|
m0: m0,
|
||||||
l0: l0,
|
l0: l0,
|
||||||
l1: l1
|
l1: l1
|
||||||
}
|
}
|
||||||
|
@ -366,7 +368,10 @@ var _default = {
|
||||||
_this.showObj = '023467';
|
_this.showObj = '023467';
|
||||||
}
|
}
|
||||||
if (_this.vip_level == 0 && _this.is_distributor !== 0) {
|
if (_this.vip_level == 0 && _this.is_distributor !== 0) {
|
||||||
_this.showObj = '0123546';
|
_this.showObj = '01234567';
|
||||||
|
}
|
||||||
|
if (_this.vip_level == 0 && _this.is_distributor == 0) {
|
||||||
|
_this.showObj = '0123467';
|
||||||
}
|
}
|
||||||
// 获取分销码
|
// 获取分销码
|
||||||
_this.getCodeEv();
|
_this.getCodeEv();
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
<block wx:if="{{isLoading}}"><view class="pad-x170"><view class="my-top"><view class="my-bg"><image src="/static/img/my-bg.jpg" mode="widthFix"></image></view><view class="my-herder pad-zy20 border-box"><view class="my-message color-ff flex"><view class="my-portrait radius100"><image src="{{headPortrait}}" mode="widthFix"></image></view><view class="my-txt flex"><view class="my-nickname font36 flex"><text>{{nickName}}</text><block wx:if="{{vip_info.ico!==''}}"><image src="{{vip_info.ico}}" mode="widthFix"></image></block></view><view class="my-vip-txt font24 background-orange radius25 pad-zy40 mar-s20 flex">{{vip_info.name}}</view></view></view><view class="my-money color-ff flex"><view data-event-opts="{{[['tap',[['goPage',['/pagesA/integral/integral']]]]]}}" class="item" bindtap="__e"><view class="font48">{{userInfo.score}}</view><text class="font24">我的积分</text></view><view data-event-opts="{{[['tap',[['goPage',['/pagesA/coupon/coupon']]]]]}}" class="item" bindtap="__e"><view class="font48">{{userInfo.coupon_count}}</view><text class="font24">我的优惠券</text></view><view data-event-opts="{{[['tap',[['goPage',['/pagesA/recharge/recharge']]]]]}}" class="item" bindtap="__e"><view class="font48">{{userInfo.balance}}</view><text class="font24">我的余额</text></view></view><view class="my-order background-grey border-box flex"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['changeOrder',[index]]]]]}}" class="item" bindtap="__e"><view class="img flex"><image style="{{'width:'+(item.$orig.iconWidth+'rpx')+';'+('height:'+(item.$orig.iconHeight+'rpx')+';')}}" src="{{item.$orig.imgSrc}}" mode="widthFix"></image><block wx:if="{{item.g0}}"><view class="point radius100"></view></block></view><view class="txt font24 color-ff">{{item.$orig.title}}</view></view></block></view></view></view><view class="my-content pad-all40"><block wx:for="{{$root.l1}}" wx:for-item="item" wx:for-index="index" wx:key="index"><block wx:if="{{item.g1!=-1}}"><view data-event-opts="{{[['tap',[['toMore',[index]]]]]}}" class="item flex" catchtap="__e"><view class="title flex"><view class="img flex"><image style="{{'width:'+(item.$orig.iconWidth+'rpx')+';'+('height:'+(item.$orig.iconHeight+'rpx')+';')}}" src="{{item.$orig.imgSrc}}" mode="widthFix"></image></view><view class="title font28">{{item.$orig.titele}}</view></view><view class="more"><image style="width:14rpx;height:26rpx;" src="/static/icon/icon-join.png" mode="widthFix"></image></view><block wx:if="{{index==0&&mobile==''}}"><button class="get-phone-btn" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['onGetPhoneNumberA',['$event']]]]]}}" bindgetphonenumber="__e"></button></block><block wx:if="{{index==1&&mobile==''}}"><button class="get-phone-btn" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['onGetPhoneNumberB',['$event']]]]]}}" bindgetphonenumber="__e"></button></block></view></block></block></view><block wx:if="{{isVip||isShow}}"><view class="pull-bg" style="background-color:rgba(0,0,0,.3);"></view></block><block wx:if="{{isVip}}"><view class="vip-box-bg border-box"><view class="vip-box radius20 background-white font30"><view class="title">会员注册</view><view class="vip-list"><view class="vip-item mar-s20"><view class="tips color-99">姓名</view><input class="input" type="text" placeholder="请输入姓名" placeholder-style="color:#000000" data-event-opts="{{[['input',[['__set_model',['','myName','$event',[]]]]]]}}" value="{{myName}}" bindinput="__e"/></view><view class="vip-item mar-s40"><view class="tips color-99">电话</view><input class="input" type="number" placeholder="请输入电话" placeholder-style="color:#000000" data-event-opts="{{[['input',[['__set_model',['','myPhone','$event',[]]]]]]}}" value="{{myPhone}}" bindinput="__e"/></view></view><view data-event-opts="{{[['tap',[['submitEv',['$event']]]]]}}" class="submit-btn font36 background-orange radius30 mar-s60 flex" bindtap="__e">注册会员</view><view data-event-opts="{{[['tap',[['closeEv',['$event']]]]]}}" class="close-btn" bindtap="__e"><image src="/static/icon/close-btn.png" mode="widthFix"></image></view></view></view></block><block wx:if="{{isLoading}}"><tabbar vue-id="704e9d00-1" current="0" bind:__l="__l"></tabbar></block></view></block>
|
<block wx:if="{{isLoading}}"><view class="pad-x170"><view class="my-top"><view class="my-bg"><image src="/static/img/my-bg.jpg" mode="widthFix"></image></view><view class="my-herder pad-zy20 border-box"><view class="my-message color-ff flex"><view class="my-portrait radius100"><image src="{{headPortrait}}" mode="widthFix"></image></view><view class="my-txt flex"><view class="my-nickname font36 flex"><text>{{nickName}}</text><block wx:if="{{vip_info.ico!==''}}"><image src="{{vip_info.ico}}" mode="widthFix"></image></block></view><view class="my-vip-txt font24 background-orange radius25 pad-zy40 mar-s20 flex">{{vip_info.name}}</view></view></view><view class="my-money color-ff flex"><view data-event-opts="{{[['tap',[['goPage',['/pagesA/integral/integral']]]]]}}" class="item" bindtap="__e"><view class="font48">{{userInfo.score}}</view><text class="font24">我的积分</text></view><view data-event-opts="{{[['tap',[['goPage',['/pagesA/coupon/coupon']]]]]}}" class="item" bindtap="__e"><view class="font48">{{userInfo.coupon_count}}</view><text class="font24">我的优惠券</text></view><view data-event-opts="{{[['tap',[['goPage',['/pagesA/recharge/recharge']]]]]}}" class="item" bindtap="__e"><view class="font48">{{$root.m0>0?userInfo.balance:0}}</view><text class="font24">我的余额</text></view></view><view class="my-order background-grey border-box flex"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['changeOrder',[index]]]]]}}" class="item" bindtap="__e"><view class="img flex"><image style="{{'width:'+(item.$orig.iconWidth+'rpx')+';'+('height:'+(item.$orig.iconHeight+'rpx')+';')}}" src="{{item.$orig.imgSrc}}" mode="widthFix"></image><block wx:if="{{item.g0}}"><view class="point radius100"></view></block></view><view class="txt font24 color-ff">{{item.$orig.title}}</view></view></block></view></view></view><view class="my-content pad-all40"><block wx:for="{{$root.l1}}" wx:for-item="item" wx:for-index="index" wx:key="index"><block wx:if="{{item.g1!=-1}}"><view data-event-opts="{{[['tap',[['toMore',[index]]]]]}}" class="item flex" catchtap="__e"><view class="title flex"><view class="img flex"><image style="{{'width:'+(item.$orig.iconWidth+'rpx')+';'+('height:'+(item.$orig.iconHeight+'rpx')+';')}}" src="{{item.$orig.imgSrc}}" mode="widthFix"></image></view><view class="title font28">{{item.$orig.titele}}</view></view><view class="more"><image style="width:14rpx;height:26rpx;" src="/static/icon/icon-join.png" mode="widthFix"></image></view><block wx:if="{{index==0&&mobile==''}}"><button class="get-phone-btn" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['onGetPhoneNumberA',['$event']]]]]}}" bindgetphonenumber="__e"></button></block><block wx:if="{{index==1&&mobile==''}}"><button class="get-phone-btn" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['onGetPhoneNumberB',['$event']]]]]}}" bindgetphonenumber="__e"></button></block></view></block></block></view><block wx:if="{{isVip||isShow}}"><view class="pull-bg" style="background-color:rgba(0,0,0,.3);"></view></block><block wx:if="{{isVip}}"><view class="vip-box-bg border-box"><view class="vip-box radius20 background-white font30"><view class="title">会员注册</view><view class="vip-list"><view class="vip-item mar-s20"><view class="tips color-99">姓名</view><input class="input" type="text" placeholder="请输入姓名" placeholder-style="color:#000000" data-event-opts="{{[['input',[['__set_model',['','myName','$event',[]]]]]]}}" value="{{myName}}" bindinput="__e"/></view><view class="vip-item mar-s40"><view class="tips color-99">电话</view><input class="input" type="number" placeholder="请输入电话" placeholder-style="color:#000000" data-event-opts="{{[['input',[['__set_model',['','myPhone','$event',[]]]]]]}}" value="{{myPhone}}" bindinput="__e"/></view></view><view data-event-opts="{{[['tap',[['submitEv',['$event']]]]]}}" class="submit-btn font36 background-orange radius30 mar-s60 flex" bindtap="__e">注册会员</view><view data-event-opts="{{[['tap',[['closeEv',['$event']]]]]}}" class="close-btn" bindtap="__e"><image src="/static/icon/close-btn.png" mode="widthFix"></image></view></view></view></block><block wx:if="{{isLoading}}"><tabbar vue-id="704e9d00-1" current="0" bind:__l="__l"></tabbar></block></view></block>
|
Loading…
Reference in New Issue