From 9e4449257e19f98cb6dfcf55c0b18f28553f4de6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Fri, 13 Aug 2021 14:30:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=B6=E6=AC=BE=E6=B5=81?=
 =?UTF-8?q?=E6=B0=B4=20=E5=BA=97=E9=93=BA=E5=B1=95=E7=A4=BA,=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=8F=9C=E5=8D=95=E6=9D=83=E9=99=90ui=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/order/flow/paymentLog.vue   |  6 ++
 .../setting-manage/setting/GOODS_SETTING.vue  | 72 ++++++++++---------
 2 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/manager/src/views/order/flow/paymentLog.vue b/manager/src/views/order/flow/paymentLog.vue
index 3c1886a6..92504fa7 100644
--- a/manager/src/views/order/flow/paymentLog.vue
+++ b/manager/src/views/order/flow/paymentLog.vue
@@ -64,6 +64,12 @@ export default {
           minWidth: 180,
           tooltip: true,
         },
+        {
+          title: "店铺名称",
+          key: "storeName",
+          minWidth: 100,
+          tooltip: true,
+        },
         {
           title: "支付方式",
           key: "paymentMethod",
diff --git a/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue b/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue
index 310135df..86f3e9ba 100644
--- a/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue
@@ -8,21 +8,6 @@
 
         </RadioGroup>
       </FormItem>
-      <div class="label-item">
-        <FormItem label="小图宽" prop="smallPictureWidth">
-          <Input type="number" v-model="formValidate.smallPictureWidth">
-          <span slot="prepend">宽</span>
-          <span slot="append">px</span>
-          </Input>
-
-        </FormItem>
-        <FormItem label="小图高" class="label-item" prop="smallPictureHeight">
-          <Input type="number" v-model="formValidate.smallPictureHeight">
-          <span slot="prepend">高</span>
-          <span slot="append">px</span>
-          </Input>
-        </FormItem>
-      </div>
       <div class="label-item">
         <FormItem class="label-item" label="缩略图宽" prop="abbreviationPictureWidth">
           <Input type="number" v-model="formValidate.abbreviationPictureWidth">
@@ -38,6 +23,21 @@
           </Input>
         </FormItem>
       </div>
+      <div class="label-item">
+        <FormItem label="小图宽" prop="smallPictureWidth">
+          <Input type="number" v-model="formValidate.smallPictureWidth">
+          <span slot="prepend">宽</span>
+          <span slot="append">px</span>
+          </Input>
+
+        </FormItem>
+        <FormItem label="小图高" class="label-item" prop="smallPictureHeight">
+          <Input type="number" v-model="formValidate.smallPictureHeight">
+          <span slot="prepend">高</span>
+          <span slot="append">px</span>
+          </Input>
+        </FormItem>
+      </div>
       <div class="label-item">
         <FormItem class="label-item" label="原图宽高" prop="originalPictureWidth">
           <Input type="number" v-model="formValidate.originalPictureWidth">
@@ -64,13 +64,14 @@
   </div>
 </template>
 <script>
-import { setSetting,createIndex,getProgress } from "@/api/index";
+import { setSetting, createIndex, getProgress } from "@/api/index";
 import { handleSubmit } from "./validate";
 export default {
   props: ["res", "type"],
   data() {
     return {
-      formValidate: { // 表单数据
+      formValidate: {
+        // 表单数据
         goodsCheck: 1,
         smallPictureHeight: "0",
         smallPictureWidth: "0",
@@ -82,7 +83,7 @@ export default {
       progressVal: 0,
       showProgress: false,
       intervalProgress: null,
-      ruleValidate: {} // 验证规则
+      ruleValidate: {}, // 验证规则
     };
   },
   created() {
@@ -92,48 +93,50 @@ export default {
     //保存
     submit(name) {
       let that = this;
-       if( handleSubmit(that, name )){
-        this.setupSetting()
+      if (handleSubmit(that, name)) {
+        this.setupSetting();
       }
     },
     //重新生成所有商品索引
-    createIndex(){
+    createIndex() {
       createIndex().then((res) => {
         if (res.success) {
           this.$Message.success("开始生成!");
           this.showProgress = true;
           setTimeout(() => {
-            this.intervalProgress = setInterval(()=> {
-              getProgress().then(resp => {
-                let progressResult = resp.result
-                if (progressResult !=null && progressResult.flag === 0) {
+            this.intervalProgress = setInterval(() => {
+              getProgress().then((resp) => {
+                let progressResult = resp.result;
+                if (progressResult != null && progressResult.flag === 0) {
                   clearInterval(this.intervalProgress);
                   this.showProgress = false;
                   this.$Message.success("生成成功!");
                 } else {
-                  this.progressVal = Math.floor((progressResult.processed / progressResult.total) * 100);
+                  this.progressVal = Math.floor(
+                    (progressResult.processed / progressResult.total) * 100
+                  );
                 }
               });
             }, 1000);
           }, 10000);
         } else if (res.code === 100000) {
           this.showProgress = true;
-          this.intervalProgress = setInterval(()=> {
-            getProgress().then(resp => {
-              let progressResult = resp.result
-              if (progressResult !=null && progressResult.flag === 0) {
+          this.intervalProgress = setInterval(() => {
+            getProgress().then((resp) => {
+              let progressResult = resp.result;
+              if (progressResult != null && progressResult.flag === 0) {
                 clearInterval(this.intervalProgress);
                 this.showProgress = false;
                 this.$Message.success("生成成功!");
               } else {
-                this.progressVal = Math.floor((progressResult.processed / progressResult.total) * 100);
+                this.progressVal = Math.floor(
+                  (progressResult.processed / progressResult.total) * 100
+                );
               }
             });
           }, 1000);
         }
       });
-
-
     },
     // 保存设置
     setupSetting() {
@@ -161,7 +164,7 @@ export default {
             message: "请填写必填项",
             trigger: "blur",
           },
-           {
+          {
             validator: (rule, value, callback) => {
               if (value < 0) {
                 callback(new Error("不能输入负数！"));
@@ -173,7 +176,6 @@ export default {
           },
         ];
       });
-
     },
   },
 };