diff --git a/api/product.js b/api/product.js index 8140b48..ee62028 100644 --- a/api/product.js +++ b/api/product.js @@ -9,6 +9,17 @@ // +---------------------------------------------------------------------- import request from "@/utils/request.js"; + +/** + * 商户类型列表 + */ +export const intentionList = (data) => request.get('intention/detail', data) + +/** + * 商户类型申请 + */ +export const shopTypeChange = (data) => request.post('intention/change', data) + /** * 获取商品详情 */ @@ -328,5 +339,4 @@ export function intention(data) { */ export function intentionbus(data) { return request.post(`intention/business`, data); -} - +} \ No newline at end of file diff --git a/pages.json b/pages.json index f4f5ac0..3a2a70e 100644 --- a/pages.json +++ b/pages.json @@ -1459,8 +1459,14 @@ "enablePullDownRefresh": false, "navigationStyle": "custom" } - }, - { + }, { + "path": "shop_type_change/list", + "style": { + "navigationBarTitleText": "申请记录", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, { "path": "addGood/addGood", "style": { "navigationBarTitleText": "商品设置", diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue index 12f1385..a018b6e 100644 --- a/pages/admin/orderList/index.vue +++ b/pages/admin/orderList/index.vue @@ -50,7 +50,8 @@ - + @@ -96,12 +97,12 @@ - 云商品 + 云商品 {{ item.activity_type == 1 ? '秒杀' : item.activity_type == 2 ? '预售' : item.activity_type == 3 ? '助力' : item.activity_type == 4 ? '拼团' : item.activity_type == 10 ? '套餐' :'' }} - - 订单号：{{ item.order_sn }} - 下单时间：{{ item.create_time }} + + 订单号：{{ item.order_sn }} + 下单时间：{{ item.create_time }} {{item.refunding==1 ? '退款中' : item.refunding==2 ? '部分退款' : '全部退款'}} @@ -120,9 +121,10 @@ {{ val.cart_info.productAttr.sku }} - - 商品条码: {{ val.cart_info.productAttr.product.bar_code }} - + + 商品条码: {{ val.cart_info.productAttr.product.bar_code }} + @@ -174,10 +176,12 @@ 一键改价 订单备注 - 去发货 - 去发货 + - + + + + + 送货人姓名 + + + + + + 送货人电话 + + + + + + + 备注 + + + + + + + 取消 + 确认 + - - - + + + @@ -260,7 +294,7 @@ }, data() { return { - showBar: false, + showBar: false, current: "", change: false, refundMark: false, @@ -271,7 +305,7 @@ status: 1, search_info: '', product_type: '', - pay_time: null, + pay_time: null, }, list: [], loaded: false, @@ -293,17 +327,17 @@ that.init(); } }, - + }, onLoad(option) { this.where.product_type = uni.getStorageSync("PRODUCT_TYPE") ?? "" this.where.status = option.types this.current = ""; this.merId = option.merId; - if(option.pay_time){ - this.where.pay_time = option.pay_time; - } - + if (option.pay_time) { + this.where.pay_time = option.pay_time; + } + this.getIndex(); }, methods: { @@ -312,13 +346,13 @@ this.popUpShow = false }, - showBarCode(val){ - this.showBar = true - this.$refs['code'].init({ - name: val.store_name, - code: val.bar_code - }); - }, + showBarCode(val) { + this.showBar = true + this.$refs['code'].init({ + name: val.store_name, + code: val.bar_code + }); + }, //同意先货后款订单 tongyi(id, number) { let data = { @@ -342,14 +376,14 @@ }, handleSearch() { this.loaded = false; - this.where.page = 1; - this.list = []; + this.where.page = 1; + this.list = []; this.getIndex(); }, // 获取数据 getIndex() { - - + + let that = this; // console.log(that.merId) if (that.loading || that.loaded) return; @@ -402,12 +436,12 @@ if (val != 'verify') { if (this.where.status != val) { this.where.status = val; - this.where.search_info='' + this.where.search_info = '' delete this.where.is_verify; this.init(); } } else { - this.where.search_info='' + this.where.search_info = '' this.where.is_verify = 1; delete this.where.status; this.init(); @@ -477,6 +511,7 @@ } }) }, + //收件码 toPostagequ(item) { this.popUpShow = true @@ -486,7 +521,12 @@ this.payCodeUrl = res.data.qrcode } }) + + + + }, + toPostage(item) { let that = this; if (item.refunding != 0) { @@ -575,7 +615,7 @@ uni.navigateTo({ url: `/pages/admin/orderDetail/index?id=${item.order_id}&mer_id=${item.mer_id}` }) - + }, toRefundDetail(item) { uni.navigateTo({ @@ -590,6 +630,63 @@ \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 893aabb..10a1c13 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -617,6 +617,10 @@ name: '收付明细', type: 22, image: require('@/static/images/index14.png') + }, { + name: '商户类型', + type: 23, + image: require('@/static/images/index14.png') }, @@ -695,6 +699,10 @@ name: '收付明细', type: 22, image: require('@/static/images/index14.png') + }, { + name: '商户类型', + type: 23, + image: require('@/static/images/index14.png') }, // { // name: '全部', @@ -741,6 +749,10 @@ name: '收付明细', type: 22, image: require('@/static/images/index14.png') + }, { + name: '商户类型', + type: 23, + image: require('@/static/images/index14.png') }, { name: '扫码付款', @@ -1534,6 +1546,14 @@ url: '/pages/payment/payment_detail?mer_id=' + this.userInfoData.service.mer_id }) break; + + case 23: + if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) Toast('暂无权限'); + else uni.navigateTo({ + url: '/pages/product/shop_type_change/index?mer_id=' + this.userInfoData + .service.mer_id + }) + break; case 17: if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) Toast('暂无权限'); else uni.navigateTo({ diff --git a/pages/payment/qrcode.vue b/pages/payment/qrcode.vue index d3e1554..cd3a35f 100644 --- a/pages/payment/qrcode.vue +++ b/pages/payment/qrcode.vue @@ -44,7 +44,17 @@ qrcode({ mer_id: merid }).then(res => { - this.img = res.data.url; + if (!res.data.count || res.data.count == 0) { + this.$util.Tips({ + title: "您还没有添加商品,请添加!" + }, () => { + uni.redirectTo({ + url: "/pages/product/addGood/addGood?mer_id=" + merid + }) + }) + } else { + this.img = res.data.url; + } }) }, @@ -112,12 +122,10 @@ } .v-qrcode { - position: absolute; - top: 400rpx; - left: 50%; - transform: translateX(-50%); width: 650rpx; height: 650rpx; + margin-top: 100rpx; + margin: 100rpx auto 0; background-color: #fff; display: flex; justify-content: center; @@ -131,16 +139,12 @@ } .v-btn { - position: absolute; - top: 1080rpx; - left: 50%; - transform: translateX(-50%); display: flex; align-items: center; justify-content: center; width: 690rpx; height: 100rpx; - margin: 0 auto; + margin: 70rpx auto 0; text { font-weight: 400; diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue index 9bfcced..de670ae 100644 --- a/pages/product/basicSet.vue +++ b/pages/product/basicSet.vue @@ -80,13 +80,6 @@ 建议尺寸:710*134px或710*460px(请根据平台要求选择尺寸，此图如未上传默认展示店铺背景图) - - - 商户类型变更 - - 类型变更 - - @@ -100,8 +93,7 @@ 到店自提 - 商家配送 + 商家配送 @@ -482,16 +474,6 @@ }); }, - // 商户类型变更 - changeType() { - uni.navigateTo({ - url: "/pages/product/shop_type_change/index", - fail(err) { - console.log(err); - } - }) - }, - seleckImage(i) { let that = this; that.$util.uploadImageOne('upload/image', function(res) { diff --git a/pages/product/shop_type_change/index.vue b/pages/product/shop_type_change/index.vue index 9d021b4..8462196 100644 --- a/pages/product/shop_type_change/index.vue +++ b/pages/product/shop_type_change/index.vue @@ -10,17 +10,22 @@ + + 申请记录 + + + 点击选择变更的商户类型 - - + + \ No newline at end of file diff --git a/pages/product/shop_type_change/progress.vue b/pages/product/shop_type_change/progress.vue index 0705067..e8b463c 100644 --- a/pages/product/shop_type_change/progress.vue +++ b/pages/product/shop_type_change/progress.vue @@ -124,7 +124,7 @@ .shop_type { .shop_type-head { background-color: #40AE36; - margin-bottom: 70rpx; + margin-bottom: 40rpx; .shop-type-navbar { display: flex; diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue index 96e6f1b..37f673c 100644 --- a/pages/store/home/index.vue +++ b/pages/store/home/index.vue @@ -1,11 +1,9 @@