diff --git a/pages/cloud_warehouse/small_classification/index.vue b/pages/cloud_warehouse/small_classification/index.vue
index 783d064..8905ba5 100644
--- a/pages/cloud_warehouse/small_classification/index.vue
+++ b/pages/cloud_warehouse/small_classification/index.vue
@@ -167,7 +167,8 @@
} from '@/api/api.js'
import {
- HTTP_REQUEST_URL
+ HTTP_REQUEST_URL,
+ ENV
} from '@/config/app';
import {
townCloud,
@@ -788,7 +789,7 @@
// 获取比例
getProportionData() {
getProportion({
- mer_id: 244
+ mer_id: ENV == 'prod' ? '259' : '244'
}).then(res => {
this.propotionData = res.data;
console.log(this.propotionData);
diff --git a/pages/payment/get_payment.vue b/pages/payment/get_payment.vue
index 7367c81..c295adb 100644
--- a/pages/payment/get_payment.vue
+++ b/pages/payment/get_payment.vue
@@ -40,12 +40,16 @@
提交订单
+
+
- 该商户没有上架提货卡~
+ 暂未登陆~
+
+
@@ -55,7 +59,17 @@
addCart,
orderCheck
} from "@/api/payment.js";
+ import {
+ mapGetters
+ } from "vuex";
+ import authorize from '@/components/Authorize';
export default {
+ components: {
+ authorize
+ },
+ computed: {
+ ...mapGetters(['isLogin']),
+ },
data() {
return {
isEmpty: false,
@@ -78,15 +92,33 @@
takes: [],
use_coupon: {},
use_integral: false
- }
+ },
+ isAuto: false, //没有授权的不会自动授权
+ isShowAuth: false, //是否隐藏授权
+ mer_id: ''
}
},
onLoad(opt) {
- this.getProductInfoByMerid(opt.mer_id);
+ this.mer_id = opt.mer_id;
+ if (!this.isLogin) {
+ this.isAuto = true;
+ this.isShowAuth = true
+ } else {
+ this.getProductInfoByMerid(opt.mer_id);
+ }
},
methods: {
+ // 授权关闭
+ authColse: function(e) {
+ this.isShowAuth = e;
+ },
+ onLoadFun() {
+ this.$Cache.set("login_back_url", getCurrentPages()[0].route + "?mer_id=" + this.mer_id);
+ this.isShowAuth = false;
+ },
+
// 提交订单
submitOrder() {
if (!this.cartForm.total_amount) {
diff --git a/pages/payment/settlement.vue b/pages/payment/settlement.vue
index 6abf9ad..a10405b 100644
--- a/pages/payment/settlement.vue
+++ b/pages/payment/settlement.vue
@@ -27,16 +27,6 @@
-
-
-
- {{agrementTtile}}
-
-
-
-
-
-
支付方式
@@ -126,65 +116,27 @@
let app = getApp();
import {
orderConfirm,
- getOrderConfirm,
- getCouponsOrderPrice,
- orderCreate,
createOrder
} from '@/api/order.js';
import {
- getAddressDefault,
- getAddressDetail,
- getAddressList,
getUserInfo,
} from '@/api/user.js';
import {
openPaySubscribe
} from '@/utils/SubscribeMessage.js';
- import {
- presellAgreement
- } from '@/api/activity.js';
- import {
- CACHE_LONGITUDE,
- CACHE_LATITUDE
- } from '@/config/cache.js';
- import couponListWindow from '@/components/orderCoupon';
- import orderGoods from '@/components/orderGoods';
- import checkDelivery from '@/components/checkDelivery/index.vue';
- import discountDetails from '@/components/discountDetails/index.vue';
- import addInvoicing from '@/components/addInvoicing';
- import parser from "@/components/jyf-parser/jyf-parser";
import {
mapGetters
} from "vuex";
- import authorize from '@/components/Authorize';
import {
configMap
} from '@/utils';
- import {
- HTTP_REQUEST_URL
- } from '@/config/app';
-
import {
orderPay
} from "@/api/payment.js";
- import {
- Toast
- } from '../../libs/uniApi';
export default {
- components: {
- couponListWindow,
- orderGoods,
- checkDelivery,
- addInvoicing,
- discountDetails,
- "jyf-parser": parser,
- authorize,
- },
-
data() {
return {
-
platformConsumption: [],
//支付方式
cartArr: [{
@@ -239,16 +191,10 @@
check: false
}],
payType: 'weixin', //支付方式
- openType: 1, //优惠券打开方式 1=使用
active: 0, //支付方式切换
address: {
address: false
}, //地址组件
- invoice: {
- invoice: false,
- mer_id: 0,
- add: true
- }, //发票组件
couponId: 0, //优惠券id
cartId: '', //购物车id
userInfo: {}, //用户信息
@@ -263,33 +209,14 @@
animated: false,
totalPrice: 0,
offlinePostage: "",
- isAuto: false, //没有授权的不会自动授权
- isShowAuth: false, //是否隐藏授权
+
from: '',
orderStatus: '', //是否有地址
couponIndex: 0, //选择商铺优惠券索引
subCoupon: {}, //提交订单使用的优惠券
- proPrice: 0, //商品总价
- isShowBox: false,
- invoice_func: false,
- special_invoice: false,
- isAgree: false,
- showProtocol: false,
- isCoupon: false,
- protocol: '',
- order_type: 0,
- addInvoice: {},
couponData: {},
orderPay: false,
- take: [],
- coupon_number: 0,
- store_coupon_number: 0,
- coupon_amount: 0,
- store_coupon_amount: 0,
- plant_coupon_amount: 0,
pics: [],
- order_model: 2,
- order_extend: [],
extend: [],
virtualIndex: 0,
platformCoupon: [],
@@ -297,7 +224,6 @@
enabledPlatformCoupon: false,
plantCoupon: false,
order_key: '',
- is_take: '',
product_type: '',
source: null,
settle_cycle: '', // 周期
@@ -347,9 +273,6 @@
this.isAuto = true;
this.isShowAuth = true
}
- if (this.payType == 'weixin') {
- this.payType = this.from
- }
},
/**
* 生命周期函数--监听页面显示
@@ -359,6 +282,16 @@
},
methods: {
+
+ // 授权关闭
+ authColse: function(e) {
+ console.log(e, 'authColse')
+ this.isShowAuth = e;
+ },
+ onLoadFun() {
+ this.isShowAuth = false;
+ },
+
// 获取个人信息
getUserInfo() {
getUserInfo().then(res => {
@@ -566,9 +499,6 @@
});
},
- getTime(index) {
- this.virtualIndex = index;
- },
SubOrder: function() {
let that = this,
data = {};
@@ -602,142 +532,6 @@
\ No newline at end of file