From bd26bb7a8827d792e84e05ac2ebd6e81aad82873 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 10 九月 2025 19:12:52 +0800
Subject: [PATCH] 扫码修改地址
---
manager/src/views/order/order/orderList.vue | 57 ++++++++++++++++++++++++++++
seller/src/views/goods/goods-seller/goodsOperationFirst.vue | 14 +++---
manager/src/main.js | 2
seller/src/views/goods/goods-seller/goodsOperationSec.vue | 41 ++++++++++++--------
4 files changed, 89 insertions(+), 25 deletions(-)
diff --git a/manager/src/main.js b/manager/src/main.js
index 7beaa40..e585996 100644
--- a/manager/src/main.js
+++ b/manager/src/main.js
@@ -50,7 +50,7 @@
window.open(src, "_blank");
};
Vue.prototype.endpoint = "https://lmk-1356772813.cos.ap-chengdu.myqcloud.com"
-Vue.prototype.QRcodeBaseUrl = "https://myk.9village.cn"
+Vue.prototype.QRcodeBaseUrl = "https://www.meiyikuang.com"
Vue.prototype.wapLinkTo = function (goodsId, skuId) {
// app绔簩缁寸爜
if (skuId) {
diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index 1161466..1c93b0d 100644
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -199,7 +199,25 @@
<Modal width="1200px" v-model="picModelFlag">
<ossManage @callback="callbackSelected" :isComponent="true" :initialize="picModelFlag" ref="ossManage" />
</Modal>
-
+ <Modal
+ v-model="showGeneralQrCode"
+ title="浜岀淮鐮�"
+ width="800"
+ :mask-closable="false"
+ :loading="codeLoading"
+ >
+ <vue-qr
+ :text="QRCodeUrl"
+ :margin="0"
+ colorDark="#000"
+ colorLight="#fff"
+ :size="150"
+ ></vue-qr>
+ <div slot="footer">
+ <Button type="text" @click="closeGeneralQrCode">鍏抽棴</Button>
+ <!-- <Button type="primary" @click="generalQrCode">纭</Button>-->
+ </div>
+ </Modal>
<multipleMap ref="map" @callback="selectedRegion" />
</Card>
</div>
@@ -212,12 +230,14 @@
import JsonExcel from "vue-json-excel";
import * as API_Member from "@/api/member.js";
import { getTags } from "@/api/tag.js";
+import vueQr from "vue-qr";
export default {
name: "orderList",
components: {
"download-excel": JsonExcel,
ossManage,
multipleMap,
+ "vue-qr": vueQr,
},
data() {
return {
@@ -444,6 +464,24 @@
)
);
}
+ // 鏍规嵁璁㈠崟鐘舵�佷负'PAID'鏃舵樉绀洪澶栨搷浣滄寜閽�
+ if (params.row.deliverStatus === 'UNDELIVERED') {
+ buttons.push(
+ h(
+ "Button",
+ {
+ props: { type: "primary", size: "small" },
+ style: { marginRight: "5px" },
+ on: {
+ click: () => {
+ this.handlerEditorQrcode(params.row);
+ },
+ },
+ },
+ "淇敼鍦板潃浜岀淮鐮�"
+ )
+ );
+ }
return h('div', buttons);
},
@@ -479,9 +517,26 @@
options: [],
titleColor:'#333', // 榛樿鏍囬棰滆壊
submitDisabled:false,
+ QRCodeUrl:'',
+ showGeneralQrCode:false,
+ codeLoading:false,
};
},
methods: {
+ closeGeneralQrCode(){
+ this.showGeneralQrCode = false;
+ },
+ handlerEditorQrcode(row){
+ this.QRCodeUrl = '';
+ this.showGeneralQrCode = true
+ this.codeLoading = true;
+
+ //鑾峰緱鍟嗗搧瀵瑰簲鐨勭涓�涓猻kuid
+ this.codeLoading = false;
+ this.QRCodeUrl = this.QRcodeBaseUrl+ '/scanpage/editOrderAddress'+'?orderSn='+row.sn
+ console.log(this.QRCodeUrl);
+
+ },
// 閫変腑鐨勫浘鐗�
callbackSelected(val) {
console.log(val)
diff --git a/seller/src/views/goods/goods-seller/goodsOperationFirst.vue b/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
index db69887..280a589 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
@@ -109,13 +109,13 @@
type: "PHYSICAL_GOODS",
check: false,
},
- // {
- // title: "铏氭嫙鍟嗗搧",
- // img: require("@/assets/goodsType2.png"),
- // desc: "铏氭嫙鏍搁獙锛屾棤闇�鐗╂祦",
- // type: "VIRTUAL_GOODS",
- // check: false,
- // },
+ {
+ title: "铏氭嫙鍟嗗搧",
+ img: require("@/assets/goodsType2.png"),
+ desc: "铏氭嫙鏍搁獙锛屾棤闇�鐗╂祦",
+ type: "VIRTUAL_GOODS",
+ check: false,
+ },
// {
// title: "鍟嗗搧妯℃澘瀵煎叆",
// img: require("@/assets/goodsTypeTpl.png"),
diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
index ffa87b6..0b8e8b0 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
@@ -270,12 +270,13 @@
</template>
</div>
</vuedraggable>
-<!-- todo 3-->
- <Upload ref="uploadSku" action="-"
+ <!-- todo 3-->
+ <Upload ref="uploadSku" :action="uploadFileUrl"
v-if="val.images < 1"
:before-upload="handleBeforeUpload"
:format="['jpg', 'jpeg', 'png', 'webp']"
:max-size="2048"
+ :headers="{ ...accessToken }"
:on-error="() => { $Spin.hide(); }"
:on-exceeded-size="handleMaxSize"
:on-format-error="handleFormatError"
@@ -1116,6 +1117,16 @@
}
},
// sku鍥剧墖涓婁紶鍓嶉挬瀛�
+ // async handleBeforeUpload(file) {
+ // const check =
+ // this.selectedSku.images !== undefined &&
+ // this.selectedSku.images.length > 5;
+ // if (check) {
+ // this.$Notice.warning({title: "鍥剧墖鏁伴噺涓嶈兘澶т簬浜斿紶"});
+ // return false;
+ // }
+ // },
+ // sku鍥剧墖涓婁紶鍓嶉挬瀛�
async handleBeforeUpload(file) {
const check =
this.selectedSku.images !== undefined &&
@@ -1459,8 +1470,8 @@
this.$Message.error("宸插瓨鍦ㄧ浉鍚岃鏍奸」锛�");
return;
}
- if (this.zz(0, val) > 20) {
- this.$Message.error("瑙勬牸鍊兼渶澶氬崄涓瓧绗﹂暱搴︼紒");
+ if (this.zz(0, val) > 30) {
+ this.$Message.error("瑙勬牸鍊兼渶澶氬崄浜斾釜瀛楃闀垮害锛�");
// val = val.toString().slice(0, 4);
this.skuInfo[index].name = this.countCharacters(val, 10);
this.$forceUpdate();// 璋冪敤璇ユ柟娉曚細瑙﹀彂缁勪欢鐨勯噸鏂版覆鏌�
@@ -1515,8 +1526,8 @@
if (val.value === '') {
return;
}
- if (this.zz(0, val.value) > 20) {
- this.$Message.error("瑙勬牸鍊兼渶澶氬崄涓瓧绗﹂暱搴︼紒");
+ if (this.zz(0, val.value) > 30) {
+ this.$Message.error("瑙勬牸鍊兼渶澶氬崄浜斾釜瀛楃闀垮害锛�");
// val.value = val.value.toString().slice(0, 4);
this.skuInfo[$index].spec_values[index].value = this.countCharacters(val.value, 10);
this.$forceUpdate();// 璋冪敤璇ユ柟娉曚細瑙﹀彂缁勪欢鐨勯噸鏂版覆鏌�
@@ -1731,7 +1742,7 @@
* 娓叉煋table鎵�闇�瑕佺殑column 鍜� data
*/
renderTableData(skus) {
- console.log('-------------->閿�鍞被鍨�',skus)
+ console.log('-------------->閿�鍞被鍨�', skus)
this.skuTableColumn = [];
let pushData = [];
// 娓叉煋澶撮儴
@@ -1999,10 +2010,10 @@
}
this.baseInfoForm.goodsId = this.goodsId;
let submit = JSON.parse(JSON.stringify(this.baseInfoForm));
- console.log('----------------->鎻愪氦',submit);
+ console.log('----------------->鎻愪氦', submit);
if (
submit.goodsGalleryFiles &&
- submit.goodsGalleryFiles.length <= 0
+ submit.goodsGalleryFiles.length <= 0
) {
this.submitLoading = false;
this.$Message.error("璇蜂笂浼犲晢鍝佸浘鐗�");
@@ -2177,16 +2188,16 @@
this.$Message.error("鍒锋柊澶辫触锛岃閲嶈瘯");
}
}).catch(reason => {
- console.log("鑾峰彇妯℃澘澶辫触",reason)
+ console.log("鑾峰彇妯℃澘澶辫触", reason)
});
},
- removeVideo(){
+ removeVideo() {
this.baseInfoForm.showGoodsVideo = null;
this.baseInfoForm.goodsVideo = null;
},
// todo 鏂囦欢涓婁紶
async upLoadImg(file) {
- console.log(file,this.count++);
+ console.log(file, this.count++);
if (this.listImages.length >= 5) {
this.$Message.error("鍥剧墖涓婁紶涓嶈兘瓒呰繃5涓�");
return;
@@ -2305,12 +2316,10 @@
this.baseInfoForm.goodsType = this.firstData.goodsType;
-
-
- if (this.categoryId!=null && this.categoryId!=='') {
+ if (this.categoryId != null && this.categoryId !== '') {
/** 鑾峰彇璇ュ晢鍩庡垎绫讳笅 鍟嗗搧鍙傛暟淇℃伅 */
this.GET_GoodsParams();
- console.log('鍒嗙被id------------------>',this.categoryId);
+ console.log('鍒嗙被id------------------>', this.categoryId);
/** 鏌ヨ鍒嗙被缁戝畾鐨勮鏍间俊鎭� */
this.Get_SkuInfoByCategory(this.categoryId);
/** 鏌ヨ鍝佺墝鍒楄〃 */
--
Gitblit v1.8.0