From 18ea8a4366bc212d5b8260ae289d4db6393df4fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Thu, 21 Oct 2021 15:48:03 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=AF=AD=E8=A8=80=E8=AE=BE=E5=AE=9A?=
 =?UTF-8?q?=E5=B0=8F=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/main.js                           |  2 +
 .../views/lili-components/i18n-translate.vue  | 51 +++++++++++++++++++
 seller/src/main.js                            |  3 +-
 .../views/lili-components/i18n-translate.vue  | 51 +++++++++++++++++++
 4 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 manager/src/views/lili-components/i18n-translate.vue
 create mode 100644 seller/src/views/lili-components/i18n-translate.vue

diff --git a/manager/src/main.js b/manager/src/main.js
index cd54c5b1..a136e6b6 100644
--- a/manager/src/main.js
+++ b/manager/src/main.js
@@ -18,6 +18,7 @@ import util from '@/libs/util'
 
 import * as filters from '@/utils/filters' // global filter
 import liliDialog from '@/views/lili-dialog'
+import i18nBox from '@/views/lili-components/i18n-translate'
 import {md5} from '@/utils/md5.js';
 Vue.config.devtools = true;
 Vue.config.productionTip = false
@@ -35,6 +36,7 @@ Vue.use(ViewUI, {
 });
 
 Vue.component('liliDialog',liliDialog)
+Vue.component('i18nBox',i18nBox)
 
 
 
diff --git a/manager/src/views/lili-components/i18n-translate.vue b/manager/src/views/lili-components/i18n-translate.vue
new file mode 100644
index 00000000..1ff68403
--- /dev/null
+++ b/manager/src/views/lili-components/i18n-translate.vue
@@ -0,0 +1,51 @@
+<template>
+  <div>
+    <Button @click="enable = true">语言设定</Button>
+    <Modal v-model="enable" draggable sticky scrollable :mask="false" :title="title">
+      <div>
+        <RadioGroup v-model="language">
+          <Radio :label="item.value || item.label" :key="index" v-for="(item,index) in data">
+            <span>{{item.title || item.name}}</span>
+          </Radio>
+        </RadioGroup>
+      </div>
+
+    </Modal>
+  </div>
+</template>
+
+<script>
+export default {
+  /**
+   * data 循环的语言内容格式 [{'title':'test','value':'val'}]
+   */
+  props: {
+    data: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  watch: {
+    /**
+     * 回调语言内容
+     */
+    language(val) {
+      if (val) {
+        this.$emit("language", val);
+      }
+    },
+  },
+  data() {
+    return {
+      language: "", //语言值
+      enable: false, //是否开启modal
+      title: "转换语言",
+    };
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/seller/src/main.js b/seller/src/main.js
index 371d9c06..5d9c5016 100644
--- a/seller/src/main.js
+++ b/seller/src/main.js
@@ -18,6 +18,7 @@ import {
 } from "@/libs/axios";
 import { setStore, getStore, removeStore } from "@/libs/storage";
 
+import i18nBox from '@/views/lili-components/i18n-translate'
 import util from "@/libs/util";
 
 
@@ -34,7 +35,7 @@ Vue.use(VueLazyload, {
 });
 
 Vue.use(ViewUI);
-
+Vue.component('i18nBox',i18nBox)
 Vue.component("vue-qr", vueQr); //此处将vue-qr添加为全局组件
 
 // 挂载全局使用的方法
diff --git a/seller/src/views/lili-components/i18n-translate.vue b/seller/src/views/lili-components/i18n-translate.vue
new file mode 100644
index 00000000..1ff68403
--- /dev/null
+++ b/seller/src/views/lili-components/i18n-translate.vue
@@ -0,0 +1,51 @@
+<template>
+  <div>
+    <Button @click="enable = true">语言设定</Button>
+    <Modal v-model="enable" draggable sticky scrollable :mask="false" :title="title">
+      <div>
+        <RadioGroup v-model="language">
+          <Radio :label="item.value || item.label" :key="index" v-for="(item,index) in data">
+            <span>{{item.title || item.name}}</span>
+          </Radio>
+        </RadioGroup>
+      </div>
+
+    </Modal>
+  </div>
+</template>
+
+<script>
+export default {
+  /**
+   * data 循环的语言内容格式 [{'title':'test','value':'val'}]
+   */
+  props: {
+    data: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  watch: {
+    /**
+     * 回调语言内容
+     */
+    language(val) {
+      if (val) {
+        this.$emit("language", val);
+      }
+    },
+  },
+  data() {
+    return {
+      language: "", //语言值
+      enable: false, //是否开启modal
+      title: "转换语言",
+    };
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
-- 
Gitee


From 0d1dbd0350b0ee4fc04dbabaf7f5ad57440636c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Thu, 21 Oct 2021 17:50:34 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=AD=E8=A8=80?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/home/home.vue               | 41 +++++++++++------
 .../views/lili-components/i18n-translate.vue  | 46 ++++++++++---------
 .../src/views/lili-components/languages.js    |  1 +
 .../views/lili-components/i18n-translate.vue  | 46 ++++++++++---------
 seller/src/views/lili-components/languages.js |  1 +
 5 files changed, 80 insertions(+), 55 deletions(-)
 create mode 100644 manager/src/views/lili-components/languages.js
 create mode 100644 seller/src/views/lili-components/languages.js

diff --git a/manager/src/views/home/home.vue b/manager/src/views/home/home.vue
index 4e604194..f29f19b8 100644
--- a/manager/src/views/home/home.vue
+++ b/manager/src/views/home/home.vue
@@ -68,7 +68,7 @@
           <div class="counts">{{$store.state.notices.refund|| 0}}</div>
           <div>待审核售后</div>
         </div>
-        <div class="todo-item" >
+        <div class="todo-item">
           <div class="counts">{{$store.state.notices.distributionCash|| 0}}</div>
           <div>待审核分销提现</div>
         </div>
@@ -197,6 +197,13 @@
       <Table stripe :columns="tophotShopsColumns" :data="topHotShopsData"></Table>
 
     </div>
+    <div>
+      <!-- 测试数据 -->
+      <Input v-model="test.a" />
+      {{test}}
+      <i18nBox :value="test.a" @language="(val)=>{test.languages = val}"></i18nBox>
+      <!-- 测试数据 -->
+    </div>
   </div>
 </template>
 
@@ -205,11 +212,22 @@ import { homeStatistics, hotGoods, hotShops, getNoticePage } from "@/api/index";
 import * as API_Goods from "@/api/goods";
 import { Chart } from "@antv/g2";
 import * as API_Member from "@/api/member";
+// import i18nBox from '@/views/lili-components/i18n-translate'
 export default {
   name: "home",
+  // components:{
+  //   i18nBox
+  // },
   data() {
     return {
-      tophotShopsColumns: [ // 表格表头
+      // 测试数据
+      test: {
+        a: "test",
+        languages:[]
+      },
+      // 测试数据结束
+      tophotShopsColumns: [
+        // 表格表头
         {
           type: "index",
           width: 100,
@@ -275,7 +293,8 @@ export default {
       pvChart: "", // 流量统计
       orderChart: "", // 订单统计
       historyMemberChart: "", // 最近会员流量统计
-      params: { // 请求参数
+      params: {
+        // 请求参数
         searchType: "LAST_SEVEN",
       },
       // 订单传参
@@ -475,15 +494,13 @@ export default {
       }
     },
     // 历史在线人数
-    initHistoryMemberChart(){
+    initHistoryMemberChart() {
       // 默认已经加载 legend-filter 交互
       let data = this.chartList;
 
       data.forEach((item) => {
-
         item.title = "历史在线人数";
-        item.date = item.date.substring(5)
-
+        item.date = item.date.substring(5);
       });
       this.historyMemberChart.data(data);
 
@@ -495,16 +512,14 @@ export default {
       this.historyMemberChart
         .line()
         .position("date*num")
-        .color("title",['#ffaa71'])
-        .shape("smooth")
-      ;
+        .color("title", ["#ffaa71"])
+        .shape("smooth");
 
       this.historyMemberChart
         .point()
         .position("date*num")
-        .color("title",['#ffaa71'])
-        .shape("circle")
-      ;
+        .color("title", ["#ffaa71"])
+        .shape("circle");
       this.historyMemberChart.render();
     },
     // 初始化信息
diff --git a/manager/src/views/lili-components/i18n-translate.vue b/manager/src/views/lili-components/i18n-translate.vue
index 1ff68403..d1d7198e 100644
--- a/manager/src/views/lili-components/i18n-translate.vue
+++ b/manager/src/views/lili-components/i18n-translate.vue
@@ -2,48 +2,52 @@
   <div>
     <Button @click="enable = true">语言设定</Button>
     <Modal v-model="enable" draggable sticky scrollable :mask="false" :title="title">
-      <div>
-        <RadioGroup v-model="language">
-          <Radio :label="item.value || item.label" :key="index" v-for="(item,index) in data">
-            <span>{{item.title || item.name}}</span>
-          </Radio>
-        </RadioGroup>
-      </div>
 
+      <Tabs closable type="card" @on-tab-remove="handleTabRemove" :value="language[0].title">
+        <TabPane v-for="(item,index) in language" :key="index" :label="item.title" :name="item.title">
+          <Input v-model="item.___i18n" />
+        </TabPane>
+      </Tabs>
     </Modal>
   </div>
 </template>
 
 <script>
+import {language} from "./languages";
 export default {
   /**
-   * data 循环的语言内容格式 [{'title':'test','value':'val'}]
+   * tabs 循环的语言内容格式 [{'title':'test','value':'val'}]
    */
   props: {
-    data: {
-      type: Array,
-      default: () => {
-        return [];
-      },
+    value: {
+      type: null,
+      default: "",
     },
   },
   watch: {
-    /**
-     * 回调语言内容
-     */
-    language(val) {
-      if (val) {
-        this.$emit("language", val);
-      }
+    language: {
+      handler(val) {
+        this.$emit("language", { language: [...val], val: this.value });
+      },
+      deep: true,
     },
   },
   data() {
     return {
-      language: "", //语言值
+      language,
+      tabVal: "",
       enable: false, //是否开启modal
       title: "转换语言",
     };
   },
+  methods: {
+    //   删除tab标签将没有用的语音进行删除
+    handleTabRemove(tab) {
+      this.language = this.language.filter((item) => {
+        return item.value != tab;
+      });
+    },
+  },
 };
 </script>
 
diff --git a/manager/src/views/lili-components/languages.js b/manager/src/views/lili-components/languages.js
new file mode 100644
index 00000000..b7324d56
--- /dev/null
+++ b/manager/src/views/lili-components/languages.js
@@ -0,0 +1 @@
+export const language = [{ title: "中文",value:1 }, { title: "英文" ,value:2}];
diff --git a/seller/src/views/lili-components/i18n-translate.vue b/seller/src/views/lili-components/i18n-translate.vue
index 1ff68403..d1d7198e 100644
--- a/seller/src/views/lili-components/i18n-translate.vue
+++ b/seller/src/views/lili-components/i18n-translate.vue
@@ -2,48 +2,52 @@
   <div>
     <Button @click="enable = true">语言设定</Button>
     <Modal v-model="enable" draggable sticky scrollable :mask="false" :title="title">
-      <div>
-        <RadioGroup v-model="language">
-          <Radio :label="item.value || item.label" :key="index" v-for="(item,index) in data">
-            <span>{{item.title || item.name}}</span>
-          </Radio>
-        </RadioGroup>
-      </div>
 
+      <Tabs closable type="card" @on-tab-remove="handleTabRemove" :value="language[0].title">
+        <TabPane v-for="(item,index) in language" :key="index" :label="item.title" :name="item.title">
+          <Input v-model="item.___i18n" />
+        </TabPane>
+      </Tabs>
     </Modal>
   </div>
 </template>
 
 <script>
+import {language} from "./languages";
 export default {
   /**
-   * data 循环的语言内容格式 [{'title':'test','value':'val'}]
+   * tabs 循环的语言内容格式 [{'title':'test','value':'val'}]
    */
   props: {
-    data: {
-      type: Array,
-      default: () => {
-        return [];
-      },
+    value: {
+      type: null,
+      default: "",
     },
   },
   watch: {
-    /**
-     * 回调语言内容
-     */
-    language(val) {
-      if (val) {
-        this.$emit("language", val);
-      }
+    language: {
+      handler(val) {
+        this.$emit("language", { language: [...val], val: this.value });
+      },
+      deep: true,
     },
   },
   data() {
     return {
-      language: "", //语言值
+      language,
+      tabVal: "",
       enable: false, //是否开启modal
       title: "转换语言",
     };
   },
+  methods: {
+    //   删除tab标签将没有用的语音进行删除
+    handleTabRemove(tab) {
+      this.language = this.language.filter((item) => {
+        return item.value != tab;
+      });
+    },
+  },
 };
 </script>
 
diff --git a/seller/src/views/lili-components/languages.js b/seller/src/views/lili-components/languages.js
new file mode 100644
index 00000000..b7324d56
--- /dev/null
+++ b/seller/src/views/lili-components/languages.js
@@ -0,0 +1 @@
+export const language = [{ title: "中文",value:1 }, { title: "英文" ,value:2}];
-- 
Gitee


From f7f836f5fdcc248e9dc17d6c2f5dd682114126dc Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Tue, 26 Oct 2021 10:38:41 +0800
Subject: [PATCH 3/3] =?UTF-8?q?PC=E6=98=BE=E7=A4=BA=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E7=BB=93=E7=AE=97=E9=A1=B5=E9=9D=A2=E5=95=86=E5=93=81=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6=E8=B0=83=E6=95=B4=EF=BC=8C=E5=90=8E=E5=8F=B0=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E5=BC=80=E5=85=B7=E6=9D=A1=E4=BB=B6=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=B7=B2=E5=8F=91=E8=B4=A7=E5=8F=AF=E4=BB=A5=E5=BC=80=E5=85=B7?=
 =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=9A=84=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/home/orderCenter/OrderDetail.vue  |  8 ++++----
 buyer/src/pages/payment/Pay.vue                   | 11 ++++++++---
 seller/src/views/order/receiptManager/receipt.vue | 12 +++++++-----
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/buyer/src/pages/home/orderCenter/OrderDetail.vue b/buyer/src/pages/home/orderCenter/OrderDetail.vue
index 12732225..98ca4ead 100644
--- a/buyer/src/pages/home/orderCenter/OrderDetail.vue
+++ b/buyer/src/pages/home/orderCenter/OrderDetail.vue
@@ -38,10 +38,10 @@
     </div>
     <div class="order-card">
       <h3>发票信息</h3>
-      <template v-if="order.order.receipt">
-        <p>发票抬头：{{order.order.receiptVO.receiptTitle}}</p>
-        <p>发票内容：{{order.order.receiptVO.receiptContent}}</p>
-        <p v-if="order.order.receiptVO.taxpayerId">纳税人识别号：{{order.order.receiptVO.taxpayerId}}</p>
+      <template v-if="order.receipt">
+        <p>发票抬头：{{order.receipt.receiptTitle}}</p>
+        <p>发票内容：{{order.receipt.receiptContent}}</p>
+        <p v-if="order.receipt.taxpayerId">纳税人识别号：{{order.receipt.taxpayerId}}</p>
       </template>
       <div v-else style="color:#999;margin-left:5px">
         未开发票
diff --git a/buyer/src/pages/payment/Pay.vue b/buyer/src/pages/payment/Pay.vue
index 88fbb69a..2e9811ab 100644
--- a/buyer/src/pages/payment/Pay.vue
+++ b/buyer/src/pages/payment/Pay.vue
@@ -5,7 +5,7 @@
     <div class="width_1200 logo">
       <div>
         <router-link to="/"
-        ><img :src="$store.state.logoImg" 
+        ><img :src="$store.state.logoImg"
         /></router-link>
         <div>结算页</div>
       </div>
@@ -569,6 +569,9 @@ export default {
 
 <style scoped lang="scss">
 @import "../../assets/styles/coupon.scss";
+.goods-msg{
+  overflow: hidden;
+}
 /** logo start */
 .logo {
   height: 40px;
@@ -772,6 +775,7 @@ export default {
 }
 
 .goods-list {
+  width: 1150px;
   background-color: #f8f8f8;
   margin: 10px 0 20px 0;
 
@@ -800,14 +804,14 @@ export default {
 
     > span:nth-child(1) {
       font-size: 12px;
-     
+
       flex: 1;
       text-align: left;
       >span{
         margin-left: 10px;
       }
     }
-   
+
 
     > span:last-child {
       color: $theme_color;
@@ -897,6 +901,7 @@ export default {
 /** content end */
 /** 底部支付栏 */
 .order-footer {
+  z-index: 20;
   height: 50px;
   @include background_color($light_white_background_color);
   @include title_color($title_color);
diff --git a/seller/src/views/order/receiptManager/receipt.vue b/seller/src/views/order/receiptManager/receipt.vue
index 8d6d0958..6d471832 100644
--- a/seller/src/views/order/receiptManager/receipt.vue
+++ b/seller/src/views/order/receiptManager/receipt.vue
@@ -85,7 +85,7 @@ export default {
         {
           title: "发票内容",
           key: "receiptContent",
-          minWidth: 120,
+          minWidth: 90,
           tooltip: true,
           render: (h, params) => {
             return h("div", params.row.receiptContent || "暂未填写");
@@ -172,10 +172,12 @@ export default {
                   },
                   attrs: {
                     disabled:
-                      params.row.orderStatus == "COMPLETED" &&
-                      params.row.receiptStatus == 0
-                        ? false
-                        : true,
+                      !(
+                        (params.row.orderStatus === "COMPLETED"
+                          ||params.row.orderStatus === "DELIVERED")
+
+                        &&
+                        params.row.receiptStatus === 0),
                   },
                   style: {
                     marginRight: "5px",
-- 
Gitee