| manager/src/main.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| manager/src/views/order/order/orderList.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| seller/src/views/goods/goods-seller/goodsOperationFirst.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| seller/src/views/goods/goods-seller/goodsOperationSec.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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) { 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; //获得商品对应的第一个skuid this.codeLoading = false; this.QRCodeUrl = this.QRcodeBaseUrl+ '/scanpage/editOrderAddress'+'?orderSn='+row.sn console.log(this.QRCodeUrl); }, // 选中的图片 callbackSelected(val) { console.log(val) 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"), 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); /** 查询品牌列表 */
