From 5612636b29e35ef1b46c527d24b4cc8231510726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Mon, 28 Jun 2021 14:22:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=AD=E7=89=A9=E8=BD=A6?=
=?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=E6=98=BE=E7=A4=BA=E5=9B=BE=E6=A0=87?=
=?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=99=9A=E6=8B=9F=E5=95=86=E5=93=81?=
=?UTF-8?q?=E9=80=80=E6=AC=BE=E5=88=A4=E6=96=AD=EF=BC=8C=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E8=83=8C=E6=99=AF=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/api.js | 8 +---
pages/mine/distribution/list.vue | 39 +++++++++++---------
pages/order/afterSales/afterSalesDetail.vue | 2 +-
pages/order/afterSales/afterSalesSelect.vue | 21 +++++++++--
pages/tabbar/cart/cartList.vue | 2 +-
static/emptyCart.jpg | Bin 3496 -> 0 bytes
static/emptyCart.png | Bin 0 -> 2755 bytes
static/img/main-bg.png | Bin 33951 -> 36642 bytes
static/logo.png | Bin 22285 -> 20124 bytes
static/signIn.png | Bin 18294 -> 5803 bytes
10 files changed, 44 insertions(+), 28 deletions(-)
delete mode 100644 static/emptyCart.jpg
create mode 100644 static/emptyCart.png
diff --git a/config/api.js b/config/api.js
index 9308538..cf3473b 100644
--- a/config/api.js
+++ b/config/api.js
@@ -4,12 +4,8 @@
*/
// 开发环境
const dev = {
- common: "http://192.168.0.100:8890",
- buyer: "http://192.168.0.100:8888",
- // common: "https://common-api.pickmall.cn",
- // buyer: "https://buyer-api.pickmall.cn",
- // common: 'http://192.168.0.109:8890',
- // buyer: 'http://192.168.0.109:8888',
+ common: "https://common-api.pickmall.cn",
+ buyer: "https://buyer-api.pickmall.cn",
};
// 生产环境
const prod = {
diff --git a/pages/mine/distribution/list.vue b/pages/mine/distribution/list.vue
index 101634d..8c668e2 100644
--- a/pages/mine/distribution/list.vue
+++ b/pages/mine/distribution/list.vue
@@ -156,9 +156,7 @@ export default {
this.routers = options;
},
watch: {
- showFlag(val) {
-
- },
+ showFlag(val) {},
},
onShow() {
this.goodsList = [];
@@ -172,27 +170,34 @@ export default {
},
async handleLink(goods) {
+ uni.showToast({
+ title: "请请按住保存图片",
+ duration: 2000,
+ icon: "none",
+ });
let page = `pages/product/goods`;
let scene = `${goods.skuId},${goods.id},${this.routers.id}`;
let result = await getMpCode({ page, scene });
- if(result.data.success){
- let callback = result.data.result;
- this.res.container.title = `${goods.goodsName}`;
- this.res.bottom.code = `data:image/png;base64,${callback}`;
- this.res.bottom.price = this.$options.filters.unitPrice(goods.price, "￥");
- this.res.bottom.desc = `${goods.goodsName}`;
- this.res.bottom.img = `${goods.thumbnail}`;
+ if (result.data.success) {
+ let callback = result.data.result;
+ this.res.container.title = `${goods.goodsName}`;
+ this.res.bottom.code = `data:image/png;base64,${callback}`;
+ this.res.bottom.price = this.$options.filters.unitPrice(
+ goods.price,
+ "￥"
+ );
+ this.res.bottom.desc = `${goods.goodsName}`;
+ this.res.bottom.img = `${goods.thumbnail}`;
- if (this.showFlag) {
- this.$refs.drawCanvas.init();
- }
- this.showFlag = true;
- }
- else{
+ if (this.showFlag) {
+ this.$refs.drawCanvas.init();
+ }
+ this.showFlag = true;
+ } else {
uni.showToast({
title: `制作二维码失败！请稍后重试`,
duration: 2000,
- icon:"none"
+ icon: "none",
});
}
},
diff --git a/pages/order/afterSales/afterSalesDetail.vue b/pages/order/afterSales/afterSalesDetail.vue
index 821d09a..20a9f73 100644
--- a/pages/order/afterSales/afterSalesDetail.vue
+++ b/pages/order/afterSales/afterSalesDetail.vue
@@ -149,7 +149,7 @@ export default {
customStyle: {
backgroundColor: this.$lightColor,
},
- applyInfo: {},
+ applyInfo: {},
form: {
orderItemSn: "", // 订单sn
skuId: "",
diff --git a/pages/order/afterSales/afterSalesSelect.vue b/pages/order/afterSales/afterSalesSelect.vue
index d16f5b1..779eca3 100644
--- a/pages/order/afterSales/afterSalesSelect.vue
+++ b/pages/order/afterSales/afterSalesSelect.vue
@@ -26,7 +26,7 @@
-
+
@@ -38,7 +38,7 @@
-
+
@@ -56,14 +56,17 @@