冲突

commont/messages.js

@@ -414,6 +414,66 @@ export default {
       confirmGoods: "是否确认收货",
       cancelOrder: "订单已取消",
       takeOrder: "订单已收货",
+      cancellationOrder: "取消订单",
+      continuePayment: "继续付款",
+      deleteOrder: "删除订单",
+      buyAgain: "再次购买",
+      anotherOrder: "再来一单",
+      confirmReceipt: "确认收货",
+      toEvaluate: "去评价",
+      orderRefunding: "退款中",
+      refundSuccessful: "退款成功",
+      refuseRefund: "拒绝退款",
+      platformIntervention: "平台介入",
+      orderRefund: "退款",
+      deleteRecord: "删除记录",
+      afterDetails: "售后详情",
+      ContinueApply: "继续申请",
+      applying: "申请中",
+      waitingRefund: "等待卖家同意退款",
+      seller: "卖家拒绝退款",
+      searchOrder: "搜索我的订单",
+      refundFailed: "退款失败",
+      //订单详情
+      leftOver: "剩",
+      hour: "小时",
+      automaticShutdown: "分自动关闭",
+      additionalPostage: "商品已打包称重，等待用户补邮费",
+      needPostage: "需补邮费",
+      requestRefund: "申请退款",
+      goodsPrice: "商品总价",
+      goodsWeight: "商品总重量",
+      accountsPayable: "应付款",
+      //平台商品库
+      searchGoods: "搜索商品名称",
+      platformGoods: "平台商品库",
+      inReview: "审核中",
+      auditFailed: "审核失败",
+      removed: "已下架",
+      supplier: "供应商",
+      selfSupport: "自营",
+      inventory: "库存",
+      removeProducts: "下架商品",
+      listingProducts: "上架商品",
+      wantDiscount: "我要打折",
+      offShelf: "下架",
+      business: "商家",
+      //商品管理
+      alreadyListed: "已上架",
+      batchDiscount: "批量打折",
+      listingGoods: "上架平台商品",
+      cancelDiscount: "取消打折",
+      deleteGoods: "是否删除商品",
+      removeGoods: "是否下架商品",
+      beenDeleted: "商品已删除",
+      cannotDiscount: "取消成功,商品初始折扣无法取消",
+      takenDown: "商品已下架",
+      takenUp: "商品已上架",
+      selectGoods: "请选择至少一个商品",
+      originalPrice: "打8折请输入80,以原价计算",
+      preferential: "优惠",
+      myGoods: "我的商品",
+      operatedProducts: "平台自营商品",
     },
   },
   //英语
@@ -824,6 +884,77 @@ export default {
       balanceRecharge: "Recharge balance account",
       customAmount: "Enter custom amount",
       payMethod: "Payment method",
+      //商城订单
+      differenzaPrezzo: "Pending price difference",
+      completato: "Completed",
+      annullato: "Cancelled",
+      refundService: "Refund/after-sales service",
+      confirmGoods: "Have you confirmed receipt of the goods",
+      cancelOrder: "Order cancelled",
+      takeOrder: "Order received",
+      cancellationOrder: "cancellation of order",
+      continuePayment: "Continue payment",
+      deleteOrder: "Delete Order",
+      buyAgain: "Buy again",
+      anotherOrder: "Another order",
+      confirmReceipt: "Confirm receipt",
+      toEvaluate: "Go evaluate",
+      orderRefunding: "refunding",
+      refundSuccessful: "Refund successful",
+      refuseRefund: "Refuse refund",
+      platformIntervention: "Platform intervention",
+      orderRefund: "refund",
+      deleteRecord: "delete record",
+      afterDetails: "After sales details",
+      ContinueApply: "Continue to apply",
+      applying: "applying",
+      waitingRefund: "Waiting for the seller to agree to a refund",
+      seller: "Seller refuses refund",
+      searchOrder: "Search for my order",
+      refundFailed: "Refund failed",
+      //订单详情
+      leftOver: "residue",
+      hour: "hour",
+      automaticShutdown: "minute Automatic shutdown",
+      additionalPostage:
+        "The product has been packaged and weighed, waiting for the user to pay the shipping fee",
+      needPostage: "Additional postage is required",
+      requestRefund: "Request a refund",
+      goodsPrice: "Total price of the product",
+      goodsWeight: "Total weight of the product",
+      accountsPayable: "Accounts payable",
+      //平台商品库
+      searchGoods: "Search for product name",
+      platformGoods: "Platform Product Library",
+      inReview: "in review",
+      auditFailed: "Audit failed",
+      removed: "Removed",
+      supplier: "supplier",
+      selfSupport: "self-support",
+      inventory: "inventory",
+      removeProducts: "Remove products",
+      listingProducts: "Listing products",
+      wantDiscount: "I want a discount",
+      offShelf: "Off shelf",
+      business: "business",
+      //商品管理
+      alreadyListed: "Already listed",
+      batchDiscount: "Batch discount",
+      listingGoods: "Listing platform products",
+      cancelDiscount: "Cancel discount",
+      deleteGoods: "Do you want to delete the product",
+      removeGoods: "Should the product be taken down",
+      beenDeleted: "The product has been deleted",
+      cannotDiscount:
+        "Cancelled successfully, the initial discount on the product cannot be cancelled",
+      takenDown: "The product has been taken down",
+      takenUp: "The product has been listed",
+      selectGoods: "Please select at least one product",
+      originalPrice:
+        "20% off, please enter 80% and calculate based on the original price",
+      preferential: "preferential",
+      myGoods: "My Products",
+      operatedProducts: "Platform self operated products",
     },
   },
   // 西班牙
@@ -1242,6 +1373,77 @@ export default {
       balanceRecharge: "Recarga de la cuenta de saldo",
       customAmount: "Introduzca la cantidad personalizada",
       payMethod: "Método de pago",
+      //商城订单
+      differenzaPrezzo: "Diferencia por compensar",
+      completato: "Completado",
+      annullato: "Cancelado",
+      refundService: "Reembolso / posventa",
+      confirmGoods: "Si se confirma la recepción",
+      cancelOrder: "El pedido ha sido cancelado",
+      takeOrder: "El pedido ha sido recibido",
+      cancellationOrder: "Cancelación del pedido",
+      continuePayment: "Seguir pagando",
+      deleteOrder: "Eliminar pedido",
+      buyAgain: "Comprar de nuevo",
+      anotherOrder: "Otro pedido",
+      confirmReceipt: "Confirmación de la recepción",
+      toEvaluate: "Para evaluar",
+      orderRefunding: "En reembolso",
+      refundSuccessful: "Reembolso exitoso",
+      refuseRefund: "Denegación de reembolso",
+      platformIntervention: "Intervención de la plataforma",
+      orderRefund: "Reembolso",
+      deleteRecord: "Borrar registro",
+      afterDetails: "Detalles post - venta",
+      ContinueApply: "Continuar solicitando",
+      applying: "En la solicitud",
+      waitingRefund: "A la espera de que el vendedor acepte el reembolso",
+      seller: "El vendedor se niega a reembolsar",
+      searchOrder: "Buscar mi pedido",
+      refundFailed: "Falló el reembolso",
+      //订单详情
+      leftOver: "Sobra",
+      hour: "Horas",
+      automaticShutdown: "Min Apagado automático",
+      additionalPostage:
+        "Los productos han sido empaquetados y pesados, esperando que los usuarios reembolsen los gastos de envío.",
+      needPostage: "Franqueo necesario",
+      requestRefund: "Solicitar un reembolso",
+      goodsPrice: "Precio total de los productos básicos",
+      goodsWeight: "Peso total de la mercancía",
+      accountsPayable: "Cuentas por pagar",
+      //平台商品库
+      searchGoods: "Buscar el nombre del producto",
+      platformGoods: "Biblioteca de productos básicos de la plataforma",
+      inReview: "En revisión",
+      auditFailed: "La auditoría falló",
+      removed: "Ha sido retirado de los estantes",
+      supplier: "Proveedores",
+      selfSupport: "Autónomo",
+      inventory: "Inventario",
+      removeProducts: "Productos retirados de los estantes",
+      listingProducts: "Productos en los estantes",
+      wantDiscount: "Quiero un descuento.",
+      offShelf: "Fuera de los estantes",
+      business: "Comerciantes",
+      //商品管理
+      alreadyListed: "En los estantes",
+      batchDiscount: "Descuentos por lotes",
+      listingGoods: "Productos de la plataforma en los estantes",
+      cancelDiscount: "Cancelación de descuentos",
+      deleteGoods: "Si eliminar la mercancía",
+      removeGoods: "Si se retiran los productos de los estantes",
+      beenDeleted: "La mercancía ha sido eliminada",
+      cannotDiscount:
+        "Cancelación exitosa, el descuento inicial de la mercancía no se puede cancelar",
+      takenDown: "La mercancía ha sido retirada de los estantes",
+      takenUp: "Los productos están en los estantes.",
+      selectGoods: "Por favor, elija al menos un producto",
+      originalPrice:
+        "Con un descuento del 20%, introduzca el 80 y calcule al precio original.",
+      preferential: "Concesiones",
+      myGoods: "Mi mercancía",
+      operatedProducts: "Productos autónomos de la plataforma",
     },
   },
   //意大利
@@ -1656,6 +1858,77 @@ export default {
       balanceRecharge: "Conto di ricarico",
       customAmount: "Inserisci importo personalizzato",
       payMethod: "Metodo di pagamento",
+      //商城订单
+      differenzaPrezzo: "Differenza di prezzo in sospeso",
+      completato: "Completato",
+      annullato: "Annullato",
+      refundService: "Rimborso/servizio post-vendita",
+      confirmGoods: "Avete confermato il ricevimento della merce",
+      cancelOrder: "Ordine annullato",
+      takeOrder: "Ordine ricevuto",
+      cancellationOrder: "annullamento dell'ordine",
+      continuePayment: "Continuare il pagamento",
+      deleteOrder: "Elimina ordine",
+      buyAgain: "Compra di nuovo",
+      anotherOrder: "Un altro ordine",
+      confirmReceipt: "Confermare la ricezione della merce",
+      toEvaluate: "Vai a valutare",
+      orderRefunding: "Restituzioni in corso",
+      refundSuccessful: "Rimborso riuscito",
+      refuseRefund: "Rimborso dei rifiuti",
+      platformIntervention: "Intervento sulla piattaforma",
+      orderRefund: "rimborso",
+      deleteRecord: "Elimina record",
+      afterDetails: "Dettagli post vendita",
+      ContinueApply: "Continuare ad applicare",
+      applying: "Applicazione in corso",
+      waitingRefund: "In attesa che il venditore accetti un rimborso",
+      seller: "Il venditore rifiuta il rimborso",
+      searchOrder: "Cerca il mio ordine",
+      refundFailed: "Rimborso fallito",
+      //订单详情
+      leftOver: "Resto",
+      hour: "ora",
+      automaticShutdown: "minuto Arresto automatico",
+      additionalPostage:
+        "Il prodotto è stato confezionato e pesato, in attesa che l'utente paghi la tassa di spedizione",
+      needPostage: "È richiesta una spedizione supplementare",
+      requestRefund: "Richiedere il rimborso",
+      goodsPrice: "Prezzo totale del prodotto",
+      goodsWeight: "Peso totale del prodotto",
+      accountsPayable: "Conti passivi",
+      //平台商品库
+      searchGoods: "Ricerca del nome del prodotto",
+      platformGoods: "Libreria di prodotti della piattaforma",
+      inReview: "In corso di revisione",
+      auditFailed: "Revisione fallita",
+      removed: "Rimosso",
+      supplier: "fornitore",
+      selfSupport: "autosufficienza",
+      inventory: "stock",
+      removeProducts: "Rimuovi prodotti",
+      listingProducts: "Elenco prodotti",
+      wantDiscount: "Voglio uno sconto",
+      offShelf: "Rimuovere dagli scaffali",
+      business: "affari",
+      //商品管理
+      alreadyListed: "Già elencato",
+      batchDiscount: "Sconto lotto",
+      listingGoods: "Elenco dei prodotti della piattaforma",
+      cancelDiscount: "Annulla sconto",
+      deleteGoods: "Vuoi eliminare il prodotto",
+      removeGoods: "In caso di ritiro del prodotto",
+      beenDeleted: "Il prodotto è stato cancellato",
+      cannotDiscount:
+        "Cancellato con successo, lo sconto iniziale sul prodotto non può essere annullato",
+      takenDown: "Il prodotto è stato rimosso",
+      takenUp: "Il prodotto è stato elencato",
+      selectGoods: "Seleziona almeno un prodotto",
+      originalPrice:
+        "20% di sconto, inserisci l'80% e calcola in base al prezzo originale",
+      preferential: "Sconto",
+      myGoods: "Il mio prodotto",
+      operatedProducts: "Prodotti autonomi della piattaforma",
     },
   },
 };

pageC/orderForm/component/orderInofrmation.vue

@@ -29,7 +29,18 @@
         <image class="commodity-img" :src="item.sku_item.image" mode=""></image>
         <view style="width: 70%">
           <view class="commodity-2">
-            <view class="commodity-title"> {{ item.goods.name_cn }} </view>
+            <view class="commodity-title" v-if="language == 'zh-CN'">
+              {{ item.goods.name_cn }}
+            </view>
+            <view class="commodity-title" v-if="language == 'en-US'">
+              {{ item.goods.name_en }}
+            </view>
+            <view class="commodity-title" v-if="language == 'es-ES'">
+              {{ item.goods.name_es }}
+            </view>
+            <view class="commodity-title" v-if="language == 'it-IT'">
+              {{ item.goods.name_ita }}
+            </view>
             <view class="commodity-price" v-if="item.sku_item">
               <text style="font-size: 20rpx">￥</text>
               <text>{{ item.discount_price.split(".")[0] }}</text
@@ -57,7 +68,7 @@
       </view>
     </view>
     <view class="price">
-      <text>需付款</text>
+      <text>{{ i18n.paymentRequired }}</text>
       <text style="font-size: 20rpx">￥</text>
       <text>{{ itemInfo.order.amount.split(".")[0] }}</text
       >.
@@ -71,21 +82,21 @@
         v-if="itemInfo.order.simplify_status == 'finished'"
         @click.stop="more"
       >
-        更多
+        {{ i18n.more }}
       </view>
       <button
         class="status-1"
         @click.stop="$emit('cancellationOrder', itemInfo)"
         v-if="itemInfo.order.simplify_status == 'unpaid'"
       >
-        取消订单
+        {{ i18n.cancellationOrder }}
       </button>
       <button
         class="status-2"
         v-if="itemInfo.order.simplify_status == 'unpaid'"
         @click.stop="$emit('toPay', itemInfo)"
       >
-        继续付款
+        {{ i18n.continuePayment }}
       </button>
       <button
         class="status-1"
@@ -95,14 +106,14 @@
           itemInfo.order.simplify_status == 'refund'
         "
       >
-        删除订单
+        {{ i18n.deleteOrder }}
       </button>
       <button
         class="status-2"
         v-if="itemInfo.order.simplify_status == 'closed'"
         @click.stop="$emit('againOrder', itemInfo)"
       >
-        再次购买
+        {{ i18n.buyAgain }}
       </button>
       <button
         class="status-1"
@@ -112,7 +123,7 @@
           itemInfo.order.simplify_status == 'finished'
         "
       >
-        查看物流
+        {{ i18n.checkLogistics }}
       </button>
       <button
         class="status-1"
@@ -122,14 +133,14 @@
         "
         @click.stop="$emit('againOrder', itemInfo)"
       >
-        再来一单
+        {{ i18n.anotherOrder }}
       </button>
       <button
         class="status-2"
         v-if="itemInfo.order.simplify_status == 'delivered'"
         @click.stop="$emit('confirm', itemInfo)"
       >
-        确认收货
+        {{ i18n.confirmReceipt }}
       </button>
 
       <button
@@ -137,12 +148,12 @@
         v-if="itemInfo.order.simplify_status == 'finished'"
         @click.stop="$emit('toDetail', itemInfo)"
       >
-        去评价
+        {{ i18n.toEvaluate }}
       </button>
       <u-transition :show="show">
-        <view class="transition" @click.stop="$emit('deleteOrder', itemInfo)"
-          >删除订单</view
-        >
+        <view class="transition" @click.stop="$emit('deleteOrder', itemInfo)">{{
+          i18n.deleteOrder
+        }}</view>
       </u-transition>
     </view>
   </view>
@@ -159,8 +170,16 @@ export default {
       typeof: Object,
       default: {},
     },
+    language: {
+      typeof: String,
+      default: "",
+    },
+  },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
   },
-  computed: {},
   data() {
     return {
       show: false,

pageC/orderForm/component/refundCard.vue

@@ -13,22 +13,22 @@
       <text
         class="order-status"
         v-if="itemInfo.order_goods[0].refund.status == 0"
-        >退款中</text
+        >{{ i18n.orderRefunding }}</text
       >
       <text
         class="order-status"
         v-if="itemInfo.order_goods[0].refund.status == 1"
-        >退款成功</text
+        >{{ i18n.refundSuccessful }}</text
       >
       <text
         class="order-status"
         v-if="itemInfo.order_goods[0].refund.status == 2"
-        >拒绝退款</text
+        >{{ i18n.refuseRefund }}</text
       >
       <text
         class="order-status"
         v-if="itemInfo.order_goods[0].refund.status == 3"
-        >平台介入</text
+        >{{ i18n.platformIntervention }}</text
       >
     </view>
     <view
@@ -59,7 +59,9 @@
               class="commodity-price"
               v-if="item.refund.actual_refund_price"
             >
-              <text style="color: #222; font-size: 26rpx">退款</text>
+              <text style="color: #222; font-size: 26rpx">{{
+                i18n.orderRefund
+              }}</text>
               <text style="font-size: 20rpx">￥</text>
               <text>{{ item.refund.actual_refund_price.split(".")[0] }}</text
               >.
@@ -69,7 +71,9 @@
             </view>
 
             <view class="commodity-price" v-else>
-              <text style="color: #222; font-size: 26rpx">退款</text>
+              <text style="color: #222; font-size: 26rpx">{{
+                i18n.orderRefund
+              }}</text>
               <text style="font-size: 20rpx">￥</text>
               <text>{{ item.refund.refund_price.split(".")[0] }}</text
               >.
@@ -83,7 +87,7 @@
                 v-if="item.refund.status == 1"
                 @click.stop="$emit('deleteAfterOrder', item)"
               >
-                删除记录</button
+                {{ i18n.deleteRecord }}</button
               ><button
                 class="status-2"
                 v-if="
@@ -93,14 +97,14 @@
                 "
                 @click.stop="$emit('toRefundDetail', item)"
               >
-                售后详情
+                {{ i18n.afterDetails }}
               </button>
               <button
                 class="status-2"
                 v-if="item.refund.status == 2 || item.refund.status == 3"
                 @click.stop="$emit('unreviewAfter', item)"
               >
-                继续申请
+                {{ i18n.ContinueApply }}
               </button>
             </view>
           </view>
@@ -108,13 +112,13 @@
       </view>
     </view>
     <view class="result" v-if="itemInfo.order_goods[0].refund.status == 0">
-      <view class="result-left"> 申请中 </view>
-      <view class="result-right"> 等待卖家同意退款 </view>
+      <view class="result-left"> {{ i18n.applying }} </view>
+      <view class="result-right"> {{ i18n.waitingRefund }} </view>
     </view>
     <view class="result" v-if="itemInfo.order_goods[0].refund.status == 1">
-      <view class="result-left"> 退款成功 </view>
+      <view class="result-left"> {{ i18n.refundSuccessful }} </view>
       <view class="result-right">
-        退款成功¥{{
+        {{ i18n.refundSuccessful }}¥{{
           itemInfo.order_goods[0].refund.actual_refund_price &&
           Number(itemInfo.order_goods[0].refund.actual_refund_price) != 0
             ? itemInfo.order_goods[0].refund.actual_refund_price
@@ -123,8 +127,8 @@
       </view>
     </view>
     <view class="result" v-if="itemInfo.order_goods[0].refund.status == 2">
-      <view class="result-left"> 退款失败 </view>
-      <view class="result-right"> 卖家拒绝退款 </view>
+      <view class="result-left"> {{ i18n.refundFailed }} </view>
+      <view class="result-right"> {{ i18n.seller }} </view>
     </view>
   </view>
 </template>
@@ -143,6 +147,11 @@ export default {
       },
     },
   },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
   data() {
     return {};
   },

pageC/orderForm/orderForm.vue

@@ -11,7 +11,7 @@
           "
         >
           <u--input
-            placeholder="搜索我的订单"
+            :placeholder="i18n.searchOrder"
             border="surround"
             shape="circle"
             v-model="keywords"
@@ -28,63 +28,63 @@
           class="tab"
           @click="tabSwitch('')"
         >
-          全部
+          {{ i18n.whole }}
         </view>
         <view
           :class="{ commodity: follow == 'unpaid' }"
           class="tab"
           @click="tabSwitch('unpaid')"
         >
-          待付款
+          {{ i18n.pendingPayment }}
         </view>
         <view
           :class="{ commodity: follow == 'unreview' }"
           class="tab"
           @click="tabSwitch('unreview')"
         >
-          拼团中
+          {{ i18n.joiningGroups }}
         </view>
         <view
           :class="{ commodity: follow == 'undelivered' }"
           class="tab"
           @click="tabSwitch('undelivered')"
         >
-          待发货
+          {{ i18n.toBeShipped }}
         </view>
         <view
           :class="{ commodity: follow == 'undifference' }"
           class="tab"
           @click="tabSwitch('undifference')"
         >
-          待补差价
+          {{ i18n.differenzaPrezzo }}
         </view>
         <view
           :class="{ commodity: follow == 'delivered' }"
           class="tab"
           @click="tabSwitch('delivered')"
         >
-          待收货
+          {{ i18n.toBeReceived }}
         </view>
         <view
           :class="{ commodity: follow == 'finished' }"
           class="tab"
           @click="tabSwitch('finished')"
         >
-          已完成
+          {{ i18n.completato }}
         </view>
         <view
           :class="{ commodity: follow == 'closed' }"
           class="tab"
           @click="tabSwitch('closed')"
         >
-          已取消
+          {{ i18n.annullato }}
         </view>
         <view
           :class="{ commodity: follow == 'refund' }"
           class="tab"
           @click="tabSwitch('refund')"
         >
-          退款/售后
+          {{ i18n.refundService }}
         </view>
       </view>
       <view v-for="(item, index) in orderList" :key="index">
@@ -92,6 +92,7 @@
           <OrderInofrmation
             ref="orderInformation"
             :itemInfo="item"
+            :language="language"
             @toDetail="toDetail"
             @cancellationOrder="cancellationOrder"
             @confirm="confirm"
@@ -107,6 +108,7 @@
           <RefundCard
             :itemInfo="item"
             :refundDetail="refundDetail"
+            :language="language"
             @toRefundDetail="toRefundDetail"
             @unreviewAfter="unreviewAfter"
             @deleteAfterOrder="deleteAfterOrder"
@@ -142,6 +144,7 @@ export default {
       title: "",
       cancellation: {},
       keywords: "", //搜索关键字
+      language: this._language, //当前用户选择的语言
     };
   },
   computed: {
@@ -195,7 +198,7 @@ export default {
     //确认收货
     confirm(value) {
       this.agreeShow = true;
-      this.title = "是否确认收货";
+      this.title = this.i18n.confirmGoods;
       this.cancellation = value;
     },
 
@@ -221,7 +224,7 @@ export default {
           this.getOrderList(1);
           this.$refs.orderInformation.more();
           uni.showToast({
-            title: "删除成功",
+            title: this.i18n.successfullydelete,
             icon: "none",
           });
         });
@@ -236,7 +239,7 @@ export default {
             .post(`/api/order/cancel/${this.cancellation.order.id}`)
             .then((res) => {
               uni.showToast({
-                title: "订单已取消",
+                title: this.i18n.cancelOrder,
                 icon: "none",
               });
               this.getOrderList(1);
@@ -246,7 +249,7 @@ export default {
             .post(`/api/order/receive/${this.cancellation.order.id}`)
             .then((res) => {
               uni.showToast({
-                title: "订单已收货",
+                title: this.i18n.takeOrder,
                 icon: "none",
               });
               this.getOrderList(1);
@@ -291,7 +294,7 @@ export default {
         .then((res) => {
           this.getOrderList(1);
           uni.showToast({
-            title: "删除成功",
+            title: this.i18n.successfullydelete,
             icon: "none",
           });
         });

pageC/orderFormDetail/component/commodityDetail.vue

@@ -1,310 +1,381 @@
 <template>
-	<view class="detail">
-		<view v-for="item in orderDetail.goods" :key="item.id">
-			<view class="title">
-				<view class="title-left">
-					<image class="header-img" :src="item.merchant.image" mode=""></image>
-					<text>{{ item.merchant.merchant_name }}</text>
-					<image class="right-325" src="../../../static/mine/325.png" mode=""></image>
-				</view>
-			</view>
-			<view class="commodity-information">
-				<view class="commodity-1">
-					<image class="commodity-img" :src="item.sku_item.image" mode=""></image>
-					<view class="" style="height: 180rpx;display: flex;flex-direction: column;justify-content: space-between;">
-						<view class="">
-							<view class="commodity-2">
-								<view class="commodity-title">{{ item.goods_name }} </view>
-								<view class="commodity-price">
-									<text style="font-size: 20rpx">￥</text>
-									<text>{{ item.discount_price.split(".")[0] }}</text>.
-									<text style="font-size: 20rpx">{{
-				        item.discount_price.split(".")[1]
-				      }}</text>
-								</view>
-							</view>
-							<view class="commodity-3">
-								<view class="specifications"> {{ item.sku_item.item }} </view>
-								<view style="font-size: 24rpx"> x{{ item.goods_num }} </view>
-							</view>
-						</view>
-						<view v-if="orderDetail.simplify_status == 'finished'" class="" style="display: flex;justify-content: space-between;">
-							<view class=""></view>
-							<view @click="toping(item)" class="" style="border: #f83224 solid 2rpx;min-width: 80rpx;height: 40rpx;line-height: 40rpx;color: #f83224;border-radius: 20rpx;text-align: center;">  
-								评价
-							</view>
-						</view>
-					</view>
-				</view>
+  <view class="detail">
+    <view v-for="item in orderDetail.goods" :key="item.id">
+      <view class="title">
+        <view class="title-left">
+          <image class="header-img" :src="item.merchant.image" mode=""></image>
+          <text>{{ item.merchant.merchant_name }}</text>
+          <image
+            class="right-325"
+            src="../../../static/mine/325.png"
+            mode=""
+          ></image>
+        </view>
+      </view>
+      <view class="commodity-information">
+        <view class="commodity-1">
+          <image
+            class="commodity-img"
+            :src="item.sku_item.image"
+            mode=""
+          ></image>
+          <view
+            class=""
+            style="
+              height: 180rpx;
+              display: flex;
+              flex-direction: column;
+              justify-content: space-between;
+            "
+          >
+            <view class="">
+              <view class="commodity-2">
+                <view class="commodity-title" v-if="language == 'zh-CN'"
+                  >{{ item.goods.name_cn }}
+                </view>
+                <view class="commodity-title" v-if="language == 'en-US'"
+                  >{{ item.goods.name_en }}
+                </view>
+                <view class="commodity-title" v-if="language == 'es-ES'"
+                  >{{ item.goods.name_es }}
+                </view>
+                <view class="commodity-title" v-if="language == 'it-IT'"
+                  >{{ item.goods.name_ita }}
+                </view>
+                <view class="commodity-price">
+                  <text style="font-size: 20rpx">￥</text>
+                  <text>{{ item.discount_price.split(".")[0] }}</text
+                  >.
+                  <text style="font-size: 20rpx">{{
+                    item.discount_price.split(".")[1]
+                  }}</text>
+                </view>
+              </view>
+              <view class="commodity-3">
+                <view class="specifications"> {{ item.sku_item.item }} </view>
+                <view style="font-size: 24rpx"> x{{ item.goods_num }} </view>
+              </view>
+            </view>
+            <view
+              v-if="orderDetail.simplify_status == 'finished'"
+              class=""
+              style="display: flex; justify-content: space-between"
+            >
+              <view class=""></view>
+              <view
+                @click="toping(item)"
+                class=""
+                style="
+                  border: #f83224 solid 2rpx;
+                  min-width: 80rpx;
+                  height: 40rpx;
+                  line-height: 40rpx;
+                  color: #f83224;
+                  border-radius: 20rpx;
+                  text-align: center;
+                "
+              >
+                {{ i18n.evaluate }}
+              </view>
+            </view>
+          </view>
+        </view>
 
-				<view class="btn-list" v-if="
+        <view
+          class="btn-list"
+          v-if="
             orderDetail.simplify_status == 'paid' ||
             orderDetail.simplify_status == 'undelivered' ||
             orderDetail.simplify_status == 'unreview' ||
             orderDetail.simplify_status == 'merdelivered'
-          ">
-					<!-- status就是 状态 0未审核 1已通过 2未通过 3平台介入 -->
-					<button @click="platformIntervene(item)" v-if="
+          "
+        >
+          <!-- status就是 状态 0未审核 1已通过 2未通过 3平台介入 -->
+          <button
+            @click="platformIntervene(item)"
+            v-if="
               item.refund &&
               (item.refund.status == 2 ||
                 item.refund.status == 0 ||
                 item.refund.status == 3)
-            ">
-						平台介入
-					</button>
-					<button @click="toRefundDetail(item)" v-if="
+            "
+          >
+            {{ i18n.platformIntervention }}
+          </button>
+          <button
+            @click="toRefundDetail(item)"
+            v-if="
               item.refund &&
               (item.refund.status == 0 ||
                 item.refund.status == 1 ||
                 item.refund.status == 2 ||
                 item.refund.status == 3)
-            ">
-						退款详情
-					</button>
-					<button @click="application(item)" v-if="item.refund && item.refund.status == 2">
-						继续申请
-					</button>
-					<button v-if="!item.refund" @click="application(item)">
-						申请退款
-					</button>
-				</view>
-			</view>
-		</view>
-		<view class="information">
-			<text class="_label">商品总价</text>
-			<view style="color: #222; font-weight: 600" v-if="orderDetail.freight">
-				<text style="font-size: 20rpx">￥</text>
-				<text>{{ orderDetail.goods_amount.split(".")[0] }}</text>.
-				<text style="font-size: 20rpx">{{
+            "
+          >
+            退款详情
+          </button>
+          <button
+            @click="application(item)"
+            v-if="item.refund && item.refund.status == 2"
+          >
+            {{ i18n.ContinueApply }}
+          </button>
+          <button v-if="!item.refund" @click="application(item)">
+            {{ i18n.requestRefund }}
+          </button>
+        </view>
+      </view>
+    </view>
+    <view class="information">
+      <text class="_label">{{ i18n.goodsPrice }}</text>
+      <view style="color: #222; font-weight: 600" v-if="orderDetail.freight">
+        <text style="font-size: 20rpx">￥</text>
+        <text>{{ orderDetail.goods_amount.split(".")[0] }}</text
+        >.
+        <text style="font-size: 20rpx">{{
           orderDetail.goods_amount.split(".")[1]
         }}</text>
-			</view>
-		</view>
-		<view class="information">
-			<text class="_label">商品总重量</text>
-			<view class="_title-right"> {{ orderDetail.weight_total || 0 }}Kg </view>
-		</view>
-		<view class="information">
-			<text class="_label">跨境物流</text>
-			<view lass="_title-right">
-				{{ orderDetail.container.transport_type.name_cn }} |
-				{{ orderDetail.container.name_cn }}
-			</view>
-		</view>
-		<view class="information last">
-			<text class="_label">运费</text>
-			<view style="color: #222; font-weight: 600" v-if="orderDetail.freight">
-				<text style="font-size: 20rpx">￥</text>
-				<text>{{ orderDetail.freight.split(".")[0] }}</text>.
-				<text style="font-size: 20rpx">{{
+      </view>
+    </view>
+    <view class="information">
+      <text class="_label">{{ i18n.goodsWeight }}</text>
+      <view class="_title-right"> {{ orderDetail.weight_total || 0 }}Kg </view>
+    </view>
+    <view class="information">
+      <text class="_label">{{ i18n.flow }}</text>
+      <view lass="_title-right">
+        {{ orderDetail.container.transport_type.name_cn }} |
+        {{ orderDetail.container.name_cn }}
+      </view>
+    </view>
+    <view class="information last">
+      <text class="_label">{{ i18n.freight }}</text>
+      <view style="color: #222; font-weight: 600" v-if="orderDetail.freight">
+        <text style="font-size: 20rpx">￥</text>
+        <text>{{ orderDetail.freight.split(".")[0] }}</text
+        >.
+        <text style="font-size: 20rpx">{{
           orderDetail.freight.split(".")[1]
         }}</text>
-			</view>
-		</view>
-		<view class="_bottom">
-			<text class="_label">应付款 </text>
-			<view style="color: #f83224; margin-left: 10rpx; font-weight: 600" v-if="orderDetail.amount">
-				<text style="font-size: 20rpx">￥</text>
-				<text>{{ orderDetail.amount.split(".")[0] }}</text>.
-				<text style="font-size: 20rpx">{{
+      </view>
+    </view>
+    <view class="_bottom">
+      <text class="_label">{{ i18n.accountsPayable }} </text>
+      <view
+        style="color: #f83224; margin-left: 10rpx; font-weight: 600"
+        v-if="orderDetail.amount"
+      >
+        <text style="font-size: 20rpx">￥</text>
+        <text>{{ orderDetail.amount.split(".")[0] }}</text
+        >.
+        <text style="font-size: 20rpx">{{
           orderDetail.amount.split(".")[1]
         }}</text>
-			</view>
-		</view>
-	</view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	import textRight from "../../accountSecurity/component/textRight.vue";
-	export default {
-		components: {
-			textRight,
-		},
-		props: {
-			status: {
-				typeof: Number,
-				default: 0,
-			},
-			orderDetail: {
-				typeof: Object,
-				default: () => {
-					return {};
-				},
-			},
-		},
-		data() {
-			return {};
-		},
-		methods: {
-			//评论
-			toping(item){
-				console.log(item);
-				uni.navigateTo({
-					url:'/pageD/evaluate/evaluate?goods='+JSON.stringify(item)
-				})
-			},
-			//申请退款
-			application(value) {
-				uni.navigateTo({
-					url: `/pageC/applicationRefund/applicationRefund?orderId=${value.id}`,
-				});
-			},
+import textRight from "../../accountSecurity/component/textRight.vue";
+export default {
+  components: {
+    textRight,
+  },
+  props: {
+    status: {
+      typeof: Number,
+      default: 0,
+    },
+    orderDetail: {
+      typeof: Object,
+      default: () => {
+        return {};
+      },
+    },
+    language: {
+      typeof: String,
+      default: "",
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
+  methods: {
+    //评论
+    toping(item) {
+      console.log(item);
+      uni.navigateTo({
+        url: "/pageD/evaluate/evaluate?goods=" + JSON.stringify(item),
+      });
+    },
+    //申请退款
+    application(value) {
+      uni.navigateTo({
+        url: `/pageC/applicationRefund/applicationRefund?orderId=${value.id}`,
+      });
+    },
 
-			//售后订单详情
-			toRefundDetail(value) {
-				uni.navigateTo({
-					url: `/pageC/refundDetail/refundDetail?orderId=${value.refund.id}`,
-				});
-			},
+    //售后订单详情
+    toRefundDetail(value) {
+      uni.navigateTo({
+        url: `/pageC/refundDetail/refundDetail?orderId=${value.refund.id}`,
+      });
+    },
 
-			//申请平台介入
-			platformIntervene(value) {
-				if (value.refund.status != 3) {
-					uni.$u.http
-						.post(`/api/order_refund/platform_intervention`, {
-							order_refund_id: value.refund.id,
-						})
-						.then((res) => {
-							uni.showToast({
-								title: "已申请平台介入",
-								icon: "none",
-							});
-						});
-				} else {
-					uni.showToast({
-						title: "平台已介入",
-						icon: "none",
-					});
-				}
-			},
-		},
-	};
+    //申请平台介入
+    platformIntervene(value) {
+      if (value.refund.status != 3) {
+        uni.$u.http
+          .post(`/api/order_refund/platform_intervention`, {
+            order_refund_id: value.refund.id,
+          })
+          .then((res) => {
+            uni.showToast({
+              title: "已申请平台介入",
+              icon: "none",
+            });
+          });
+      } else {
+        uni.showToast({
+          title: "平台已介入",
+          icon: "none",
+        });
+      }
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
-	.detail {
-		padding: 28rpx 20rpx;
-		background-color: #fff;
-		border-radius: 16rpx;
-		margin-top: 28rpx;
+.detail {
+  padding: 28rpx 20rpx;
+  background-color: #fff;
+  border-radius: 16rpx;
+  margin-top: 28rpx;
 
-		.title {
-			display: flex;
-			justify-content: space-between;
-			margin-top: 20rpx;
+  .title {
+    display: flex;
+    justify-content: space-between;
+    margin-top: 20rpx;
 
-			.title-left {
-				display: flex;
-				font-size: 32rpx;
-				align-items: center;
+    .title-left {
+      display: flex;
+      font-size: 32rpx;
+      align-items: center;
 
-				.header-img {
-					width: 36rpx;
-					height: 36rpx;
-					border-radius: 50%;
-					margin-right: 20rpx;
-				}
+      .header-img {
+        width: 36rpx;
+        height: 36rpx;
+        border-radius: 50%;
+        margin-right: 20rpx;
+      }
 
-				.right-325 {
-					width: 32rpx;
-					height: 32rpx;
-				}
-			}
+      .right-325 {
+        width: 32rpx;
+        height: 32rpx;
+      }
+    }
 
-			.order-status {
-				color: #f83224;
-				font-size: 26rpx;
-			}
-		}
+    .order-status {
+      color: #f83224;
+      font-size: 26rpx;
+    }
+  }
 
-		.commodity-information {
-			margin-top: 28rpx;
+  .commodity-information {
+    margin-top: 28rpx;
 
-			.commodity-1 {
-				display: flex;
+    .commodity-1 {
+      display: flex;
 
-				.commodity-img {
-					width: 180rpx;
-					height: 180rpx;
-					margin-right: 20rpx;
-					border-radius: 10rpx;
-				}
+      .commodity-img {
+        width: 180rpx;
+        height: 180rpx;
+        margin-right: 20rpx;
+        border-radius: 10rpx;
+      }
 
-				.commodity-2 {
-					display: flex;
-					justify-content: space-between;
+      .commodity-2 {
+        display: flex;
+        justify-content: space-between;
 
-					.commodity-title {
-						width: 328rpx;
-						overflow: hidden;
-						white-space: nowrap;
-						text-overflow: ellipsis;
-						margin-right: 38rpx;
-					}
-				}
+        .commodity-title {
+          width: 328rpx;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          margin-right: 38rpx;
+        }
+      }
 
-				.commodity-3 {
-					display: flex;
-					justify-content: space-between;
-					margin-top: 20rpx;
-					color: #777;
+      .commodity-3 {
+        display: flex;
+        justify-content: space-between;
+        margin-top: 20rpx;
+        color: #777;
 
-					.specifications {
-						font-size: 28rpx;
-						color: #777;
-					}
-				}
-			}
-		}
+        .specifications {
+          font-size: 28rpx;
+          color: #777;
+        }
+      }
+    }
+  }
 
-		.last {
-			border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
-			padding-bottom: 20rpx;
-		}
+  .last {
+    border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+    padding-bottom: 20rpx;
+  }
 
-		.btn-list {
-			display: flex;
-			justify-content: flex-end;
+  .btn-list {
+    display: flex;
+    justify-content: flex-end;
 
-			button {
-				width: 152rpx;
-				height: 58rpx;
-				border: 2rpx solid #979797;
-				color: #444;
-				margin: 0;
-				padding: 0;
-				font-size: 24rpx;
-				background-color: #fff;
-				border-radius: 34rpx;
-				margin-top: 20rpx;
-				margin-left: 20rpx;
-			}
-		}
+    button {
+      width: 152rpx;
+      height: 58rpx;
+      border: 2rpx solid #979797;
+      color: #444;
+      margin: 0;
+      padding: 0;
+      font-size: 24rpx;
+      background-color: #fff;
+      border-radius: 34rpx;
+      margin-top: 20rpx;
+      margin-left: 20rpx;
+    }
+  }
 
-		.information {
-			display: flex;
-			justify-content: space-between;
-			font-size: 28rpx;
-			align-items: flex-end;
-			margin: 34rpx 0;
+  .information {
+    display: flex;
+    justify-content: space-between;
+    font-size: 28rpx;
+    align-items: flex-end;
+    margin: 34rpx 0;
 
-			._label {
-				font-size: 28rpx;
-				color: #333;
-			}
+    ._label {
+      font-size: 28rpx;
+      color: #333;
+    }
 
-			._title-right {
-				font-size: 28rpx;
-				color: #333;
-			}
-		}
+    ._title-right {
+      font-size: 28rpx;
+      color: #333;
+    }
+  }
 
-		._bottom {
-			display: flex;
-			justify-content: flex-end;
-			font-size: 28rpx;
-			align-items: flex-end;
-			margin-top: 34rpx;
-		}
-	}
-</style>
+  ._bottom {
+    display: flex;
+    justify-content: flex-end;
+    font-size: 28rpx;
+    align-items: flex-end;
+    margin-top: 34rpx;
+  }
+}
+</style>

pageC/orderFormDetail/orderFormDetail.vue

@@ -5,13 +5,14 @@
       <view class="payment">{{ orderDetail.simplify_status_text }}</view>
 
       <text class="timer" v-if="orderDetail.simplify_status == 'unpaid'"
-        >剩<text v-if="loseEfficacy / 60 > 1">{{ hours }}小时</text
-        >{{ minute }}分自动关闭</text
+        >{{ i18n.leftOver
+        }}<text v-if="loseEfficacy / 60 > 1">{{ hours }}{{ i18n.hour }}</text
+        >{{ minute }}{{ i18n.automaticShutdown }}</text
       >
       <text
         v-else-if="orderDetail.simplify_status == 'undifference'"
         class="timer"
-        >商品已打包称重，等待用户补邮费</text
+        >{{ i18n.additionalPostage }}</text
       >
     </view>
 
@@ -30,11 +31,11 @@
     </view>
     <view class="photo" v-if="orderDetail.simplify_status == 'undifference'">
       <view class="_weight">
-        <text>称重重量</text>
+        <text>{{ i18n.weighingWeight }}</text>
         <text>{{ orderDetail.call_weight }}kg</text>
       </view>
       <view class="_weight">
-        <text>称重图片</text>
+        <text>{{ i18n.weighingImage }}</text>
         <!-- <view class="_image"> </view> -->
         <image
           :src="orderDetail.call_image"
@@ -43,7 +44,7 @@
         />
       </view>
       <view class="photo-bottom">
-        <text class="_text-1">需补邮费</text>
+        <text class="_text-1">{{ i18n.needPostage }}</text>
         <view class="price">
           <text style="font-size: 20rpx">￥</text>
           <text>{{ orderDetail.fill_price.split(".")[0] }}</text
@@ -55,15 +56,19 @@
       </view>
     </view>
 
-    <commodityDetailVue :status="status" :orderDetail="orderDetail" />
+    <commodityDetailVue
+      :status="status"
+      :orderDetail="orderDetail"
+      :language="language"
+    />
 
     <view class="order">
       <view class="order-number">
-        <text> 订单编号 </text>
+        <text> {{ i18n.OrderNumber }} </text>
         <view>
           {{ orderDetail.order_no }} |
           <text decode @click="cope(orderDetail.order_no)">{{
-            "&nbsp;" + "复制"
+            "&nbsp;" + i18n.cope
           }}</text>
         </view>
       </view>
@@ -79,7 +84,7 @@
           orderDetail.simplify_status == 'undifference'
         "
       >
-        <text> 支付方式 </text>
+        <text> {{ i18n.payMethod }} </text>
         <view> {{ orderDetail.pay_type_name }} </view>
       </view>
       <view
@@ -93,11 +98,11 @@
           orderDetail.simplify_status == 'undifference'
         "
       >
-        <text> 支付时间 </text>
+        <text> {{ i18n.payTime }} </text>
         <view> {{ orderDetail.paid_at }} </view>
       </view>
       <view class="order-number">
-        <text> 下单时间 </text>
+        <text> {{ i18n.Ordertime }} </text>
         <view>{{ orderDetail.created_at }} </view>
       </view>
     </view>
@@ -130,14 +135,14 @@
         "
         @click="cancelOrder"
       >
-        取消订单
+        {{ i18n.cancellationOrder }}
       </button>
       <button
         class="status-2"
         v-if="orderDetail.simplify_status == 'unpaid'"
         @click="toUnPay"
       >
-        继续付款
+        {{ i18n.continuePayment }}
       </button>
       <button
         class="status-1"
@@ -146,7 +151,7 @@
           orderDetail.simplify_status == 'closed' || status == 3 || status == 4
         "
       >
-        删除订单
+        {{ i18n.deleteOrder }}
       </button>
       <button
         class="status-2"
@@ -155,7 +160,7 @@
           orderDetail.simplify_status == 'closed' || status == 3 || status == 4
         "
       >
-        再次购买
+        {{ i18n.buyAgain }}
       </button>
       <button
         class="status-1"
@@ -165,7 +170,7 @@
         "
         @click="toLogistics"
       >
-        查看物流
+        {{ i18n.checkLogistics }}
       </button>
       <button
         class="status-2"
@@ -175,29 +180,29 @@
         "
         @click="confirmReceipt"
       >
-        确认收货
+        {{ i18n.confirmReceipt }}
       </button>
       <view
         style="margin-right: 40rpx; color: #777; font-size: 28rpx"
         v-if="orderDetail.simplify_status == 'finished'"
         @click="more"
-        >更多</view
+        >{{ i18n.more }}</view
       >
       <button
         class="status-1"
         v-if="orderDetail.simplify_status == 'finished'"
         @click="toLogistics"
       >
-        查看物流
+        {{ i18n.checkLogistics }}
       </button>
       <button
         class="status-1"
         v-if="orderDetail.simplify_status == 'finished'"
         @click.stop="againOrder"
       >
-        再来一单
+        {{ i18n.anotherOrder }}
       </button>
-<!--      <button
+      <!--      <button
         class="status-2"
         v-if="orderDetail.simplify_status == 'finished'"
         @click.stop="toEvaluate"
@@ -209,14 +214,20 @@
         v-if="orderDetail.simplify_status == 'undifference'"
         @click.stop="toPay"
       >
-        立即付款
+        {{ i18n.payment }}
       </button>
     </view>
 
     <u-transition :show="show">
-      <view class="transition" @click.stop="deleteOrder">删除订单</view>
+      <view class="transition" @click.stop="deleteOrder">{{
+        i18n.deleteOrder
+      }}</view>
     </u-transition>
-    <agreePopup title="是否确认收货" :agreeShow="agreeShow" @close="close" />
+    <agreePopup
+      :title="i18n.confirmGoods"
+      :agreeShow="agreeShow"
+      @close="close"
+    />
   </view>
 </template>
 
@@ -228,6 +239,7 @@ export default {
     commodityDetailVue,
     agreePopup,
   },
+
   data() {
     return {
       status: 6,
@@ -237,8 +249,15 @@ export default {
       hours: "",
       minute: "",
       loseEfficacy: "", //失效时间
+      language: this._language, //当前用户选择的语言
     };
   },
+
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
   methods: {
     //复制
     cope(e) {
@@ -301,7 +320,7 @@ export default {
           });
           this.show = false;
           uni.showToast({
-            title: "删除成功",
+            title: this.i18n.successfullydelete,
             icon: "none",
           });
         });
@@ -345,7 +364,7 @@ export default {
         .then((res) => {
           this.getDetail();
           uni.showToast({
-            title: "已取消",
+            title: this.i18n.annullato,
             icon: "none",
           });
         });
@@ -390,10 +409,7 @@ export default {
     this.getConfig();
     this.getDetail();
   },
-  created() {},
-  mounted() {
-    // this.getDetail();
-  },
+
   onLoad(option) {
     this.status = option.orderId;
   },

pageC/switchLanguage/switchLanguage.vue

@@ -1,106 +1,124 @@
 <template>
-	<view class="page">
-		<view class="btn-list">
-			<view class="language" data-lang="zh-CN" @tap="langChange">
-				<text>简体中文</text>
-				<image v-if="languageSelect == 'zh-CN'" class="selected" src="../../static/mine/326.png" mode="">
-				</image>
-			</view>
-			<view class="language" data-lang="en-US" @tap="langChange">
-				<text>English</text>
-				<image v-if="languageSelect == 'en-US'" class="selected" src="../../static/mine/326.png" mode="">
-				</image>
-			</view>
-			<view class="language" data-lang="es-ES" @tap="langChange">
-				<text>Español</text>
-				<image v-if="languageSelect == 'es-ES'" class="selected" src="../../static/mine/326.png" mode="">
-				</image>
-			</view>
-			<view class="language" data-lang="it-IT" @tap="langChange">
-				<text>Italiano</text>
-				<image v-if="languageSelect == 'it-IT'" class="selected" src="../../static/mine/326.png" mode="">
-				</image>
-			</view>
-		</view>
-	</view>
+  <view class="page">
+    <view class="btn-list">
+      <view class="language" data-lang="zh-CN" @tap="langChange">
+        <text>简体中文</text>
+        <image
+          v-if="languageSelect == 'zh-CN'"
+          class="selected"
+          src="../../static/mine/326.png"
+          mode=""
+        >
+        </image>
+      </view>
+      <view class="language" data-lang="en-US" @tap="langChange">
+        <text>English</text>
+        <image
+          v-if="languageSelect == 'en-US'"
+          class="selected"
+          src="../../static/mine/326.png"
+          mode=""
+        >
+        </image>
+      </view>
+      <view class="language" data-lang="es-ES" @tap="langChange">
+        <text>Español</text>
+        <image
+          v-if="languageSelect == 'es-ES'"
+          class="selected"
+          src="../../static/mine/326.png"
+          mode=""
+        >
+        </image>
+      </view>
+      <view class="language" data-lang="it-IT" @tap="langChange">
+        <text>Italiano</text>
+        <image
+          v-if="languageSelect == 'it-IT'"
+          class="selected"
+          src="../../static/mine/326.png"
+          mode=""
+        >
+        </image>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				languageSelect: "",
-				language: "cn",
-			};
-		},
-		computed: {
-			i18n() {
-				return this.$t("index");
-			},
-		},
-		methods: {
-			update() {
-				uni.$u.http
-					.post("/api/member/update", {
-						lang: this.language,
-					})
-					.then((res) => {
-						this.$u.toast("切换成功");
-					})
-					.catch(() => {});
-			},
-			langChange(e) {
-				const {
-					lang
-				} = e.currentTarget.dataset;
-				uni.setStorageSync("language", lang);
-				this._i18n.locale = lang;
-				this.languageSelect = lang;
-				if (this.languageSelect == "zh-CN") {
-					this.language = "cn";
-				} else if (this.languageSelect == "en-US") {
-					this.language = "en";
-				} else if (this.languageSelect == "es-ES") {
-					this.language = "es";
-				} else if (this.languageSelect == "it-IT") {
-					this.language = "ita";
-				}
-				this.update();
-				uni.setNavigationBarTitle({
-					title: this.i18n.switchLanguage,
-				});
-			},
-		},
-		created() {
-			this.languageSelect = this._i18n.locale;
-			uni.setNavigationBarTitle({
-				title: this.i18n.switchLanguage,
-			});
-		},
-	};
+export default {
+  data() {
+    return {
+      languageSelect: "",
+      language: "cn",
+    };
+  },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
+  methods: {
+    update() {
+      uni.$u.http
+        .post("/api/member/update", {
+          lang: this.language,
+        })
+        .then((res) => {
+          this.$u.toast("切换成功");
+        })
+        .catch(() => {});
+    },
+    langChange(e) {
+      const { lang } = e.currentTarget.dataset;
+      uni.setStorageSync("language", lang);
+      this._i18n.locale = lang;
+      this.languageSelect = lang;
+      if (this.languageSelect == "zh-CN") {
+        this.language = "cn";
+      } else if (this.languageSelect == "en-US") {
+        this.language = "en";
+      } else if (this.languageSelect == "es-ES") {
+        this.language = "es";
+      } else if (this.languageSelect == "it-IT") {
+        this.language = "ita";
+      }
+      this.update();
+      uni.setNavigationBarTitle({
+        title: this.i18n.switchLanguage,
+      });
+    },
+  },
+  created() {
+    this.languageSelect = this._i18n.locale;
+    uni.setNavigationBarTitle({
+      title: this.i18n.switchLanguage,
+    });
+  },
+};
 </script>
 
 <style scoped lang="scss">
-	.page {
-		padding: 20rpx 24rpx;
+.page {
+  padding: 20rpx 24rpx;
 
-		.btn-list {
-			background-color: #fff;
-			border-radius: 16rpx;
-			padding: 0 20rpx;
+  .btn-list {
+    background-color: #fff;
+    border-radius: 16rpx;
+    padding: 0 20rpx;
 
-			.language {
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				height: 110rpx;
-				border-bottom: 2rpx solid rgba(151, 151, 151, 0.2);
+    .language {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 110rpx;
+      border-bottom: 2rpx solid rgba(151, 151, 151, 0.2);
 
-				.selected {
-					width: 36rpx;
-					height: 36rpx;
-				}
-			}
-		}
-	}
-</style>
+      .selected {
+        width: 36rpx;
+        height: 36rpx;
+      }
+    }
+  }
+}
+</style>

pageD/commodityManage/commodityManage.vue

@@ -5,14 +5,14 @@
       <view class="search">
         <u--input
           v-model="keywords"
-          placeholder="搜索商品名称"
+          :placeholder="i18n.searchGoods"
           shape="circle"
           prefixIcon="search"
           prefixIconStyle="font-size: 22px;color: #909399"
           @change="search"
         ></u--input>
         <view class="screen" @click="openPopup">
-          筛选
+          {{ i18n.screen }}
           <image
             class="screen-icon"
             src="../../static/mine/334.png"
@@ -27,21 +27,21 @@
             class="tab"
             @click="tabSwitch('')"
           >
-            全部
+            {{ i18n.whole }}
           </view>
           <view
             :class="{ commodity: follow == 'normal' }"
             class="tab"
             @click="tabSwitch('normal')"
           >
-            已上架
+            {{ i18n.alreadyListed }}
           </view>
           <view
             :class="{ commodity: follow == 'down' }"
             class="tab"
             @click="tabSwitch('down')"
           >
-            已下架
+            {{ i18n.removed }}
           </view>
         </view>
       </view>
@@ -83,8 +83,10 @@
       </u-checkbox-group>
     </view>
     <view class="footer" v-if="!batch">
-      <view class="batch" @click="batchDiscount"> 批量打折 </view>
-      <button class="btn-1" @click="toPlatform">上架平台商品</button>
+      <view class="batch" @click="batchDiscount">
+        {{ i18n.batchDiscount }}
+      </view>
+      <button class="btn-1" @click="toPlatform">{{ i18n.listingGoods }}</button>
     </view>
     <view class="footer" v-else>
       <view class="batch" @click="allSelect">
@@ -94,7 +96,7 @@
           color="#f83224"
           activeBackgroundColor="#f83224"
         ></radio>
-        全选
+        {{ i18n.selectall }}
       </view>
       <view
         style="
@@ -103,9 +105,9 @@
           color: rgba(54, 54, 54, 0.5);
         "
         @click="cancelBatchDiscount"
-        >取消打折</view
+        >{{ i18n.cancelDiscount }}</view
       >
-      <button class="btn" @click="wantDiscount">我要打折</button>
+      <button class="btn" @click="wantDiscount">{{ i18n.wantDiscount }}</button>
     </view>
     <!-- 筛选弹窗 -->
     <ScreenPopup :show="show" @close="close" :follow="follow" />
@@ -205,7 +207,7 @@ export default {
     deleteGoods(value) {
       console.log(value);
       this.agreeShow = true;
-      this.title = "是否删除商品";
+      this.title = this.i18n.deleteGoods;
       this.needDeleteGoods = value;
     },
 
@@ -223,7 +225,7 @@ export default {
             .then((res) => {
               this.getCommodityList(this.follow);
               uni.showToast({
-                title: "商品已删除",
+                title: this.i18n.beenDeleted,
                 icon: "none",
               });
             });
@@ -240,7 +242,7 @@ export default {
         .then((res) => {
           this.getCommodityList();
           uni.showToast({
-            title: "取消成功,商品初始折扣无法取消",
+            title: this.i18n.cannotDiscount,
             icon: "none",
           });
         });
@@ -255,7 +257,7 @@ export default {
         })
         .then((res) => {
           uni.showToast({
-            title: value == "down" ? "商品已下架" : "商品已上架",
+            title: value == "down" ? this.i18n.takenDown : this.i18n.takenUp,
           });
           this.getCommodityList(this.follow);
         });
@@ -264,7 +266,7 @@ export default {
     //商品上架 or 下架
     addAndRemove(item, value) {
       if (value == "down") {
-        this.title = "是否下架商品";
+        this.title = this.i18n.removeGoods;
         this.agreeShow = true;
         // this.goodsApi(item, value);
         this.needDeleteGoods = item;
@@ -330,13 +332,13 @@ export default {
     batchDiscount() {
       this.batch = !this.batch;
       uni.setNavigationBarTitle({
-        title: "批量打折",
+        title: this.i18n.batchDiscount,
       });
     },
     cancelBatchDiscount() {
       this.batch = false;
       uni.setNavigationBarTitle({
-        title: "商品管理",
+        title: this.i18n.productManagement,
       });
       this.selectedGoods = [];
     },
@@ -346,7 +348,7 @@ export default {
         this.$refs.uToast.show({
           type: "default",
           title: "默认主题",
-          message: "请选择至少一个商品",
+          message: this.i18n.selectGoods,
         });
         return;
       }
@@ -370,7 +372,7 @@ export default {
             });
           this.batch = false;
           uni.setNavigationBarTitle({
-            title: "商品管理",
+            title: this.i18n.productManagement,
           });
         }
       } else if (this.discountsShow) {
@@ -427,7 +429,7 @@ export default {
   mounted() {
     this.getCommodityList();
     uni.setNavigationBarTitle({
-      title: "商品管理",
+      title: this.i18n.productManagement,
     });
   },
 };

pageD/commodityManage/component/batchDiscountPopup.vue

@@ -1,12 +1,12 @@
 <template>
   <u-popup :show="show" mode="bottom" :round="10" closeable @close="close">
     <view class="content">
-      <view class="goods-information"> 我要打折 </view>
+      <view class="goods-information"> {{ i18n.wantDiscount }}</view>
       <view class="discount">
-        <view class=""> 折扣 </view>
+        <view class=""> {{ i18n.discount }} </view>
         <u--input
           inputAlign="right"
-          placeholder="打8折请输入80,以原价计算"
+          :placeholder="i18n.originalPrice"
           border="none"
           type="number"
           v-model="value"
@@ -28,7 +28,7 @@
           <text style="color: #f83224">-￥{{ preferential }}</text>
         </view>
       </view> -->
-      <button class="btn" @click="confirm">确定</button>
+      <button class="btn" @click="confirm">{{ i18n.enter }}</button>
     </view>
   </u-popup>
 </template>
@@ -54,6 +54,11 @@ export default {
       preferential: 0,
     };
   },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
   methods: {
     close() {
       this.value = "";

pageD/commodityManage/component/discountsPopup.vue

@@ -17,10 +17,10 @@
         </view>
       </view>
       <view class="discount">
-        <view class=""> 折扣 </view>
+        <view class=""> {{ i18n.discount }} </view>
         <u--input
           inputAlign="right"
-          placeholder="打8折请输入80,以原价计算"
+          :placeholder="i18n.originalPrice"
           border="none"
           type="number"
           v-model="value"
@@ -31,15 +31,15 @@
       </view>
       <view class="text-list" v-if="value">
         <view class="_text-1">
-          <text>折扣价</text>
+          <text>{{ i18n.Discounted }}</text>
           <text>￥{{ discountPrice }}</text>
         </view>
         <view class="_text-1">
-          <text>优惠</text>
+          <text>{{ i18n.preferential }}</text>
           <text style="color: #f83224">-￥{{ preferential }}</text>
         </view>
       </view>
-      <button class="btn" @click="confirm">确定</button>
+      <button class="btn" @click="confirm">{{ i18n.enter }}</button>
     </view>
   </u-popup>
 </template>
@@ -65,6 +65,11 @@ export default {
       preferential: 0,
     };
   },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
   methods: {
     close() {
       this.value = "";

pageD/commodityManage/component/goodsInformation.vue

@@ -3,17 +3,19 @@
     <view class="content">
       <image :src="itemInfo.goods.image" mode="" class="content-img"></image>
       <view class="mask" v-if="!downOrGrounding">
-        <view class="text-1"> 已下架 </view>
+        <view class="text-1"> {{ i18n.removed }} </view>
       </view>
       <view class="content-right">
         <view class="goods-title">
-          <view class="_label" v-if="itemInfo.goods.source == 2"> 供应商 </view>
+          <view class="_label" v-if="itemInfo.goods.source == 2">
+            {{ i18n.supplier }}
+          </view>
           <view
             class="_label"
             style="background-color: #f83224"
             v-if="itemInfo.goods.source == 1"
           >
-            自营
+            {{ i18n.selfSupport }}
           </view>
           <!-- <view class="_label" v-if="itemInfo.goods.source == 0"> 团长 </view> -->
           <view class="title" v-if="productAndCommodity == 'product'">
@@ -22,7 +24,7 @@
           <view class="title" v-else>{{ itemInfo.goods.name_cn }}</view>
         </view>
         <view class="inventory" v-if="productAndCommodity">
-          <text>库存：</text>
+          <text>{{ i18n.inventory }}：</text>
           <text>{{ itemInfo.goods.stock }}</text>
         </view>
         <view class="inventory" v-else>
@@ -56,28 +58,28 @@
         "
         @click.stop="$emit('cancelDiscount', itemInfo)"
       >
-        取消打折
+        {{ i18n.cancelDiscount }}
       </button>
       <button
         class="btn-1"
         v-if="downOrGrounding"
         @click.stop="$emit('openDiscountsPopup', itemInfo)"
       >
-        我要打折
+        {{ i18n.wantDiscount }}
       </button>
       <button
         class="btn-1"
         v-if="downOrGrounding"
         @click.stop="$emit('addAndRemove', itemInfo, 'down')"
       >
-        下架
+        {{ i18n.offShelf }}
       </button>
       <button
         class="btn-1"
         v-if="!downOrGrounding"
         @click.stop="$emit('deleteGoods', itemInfo)"
       >
-        删除
+        {{ i18n.delete }}
       </button>
       <button
         class="btn-1"
@@ -114,14 +116,9 @@ export default {
     },
   },
   watch: {},
-  computed: {},
   data() {
     return {
-      obj: {
-        url: "https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/136953/20/42322/162799/665e6a6cF32604c1e/b9586c7ae52dc284.jpg.avif",
-        title: "La Chapelle Sport拉夏贝尔高…",
-        price: "75.00",
-      },
+      obj: {},
       lebelList: [],
     };
   },
@@ -131,6 +128,9 @@ export default {
         return "padding: 28rpx 20rpx 20rpx;";
       }
     },
+    i18n() {
+      return this.$t("index");
+    },
 
     downOrGrounding() {
       if (this.itemInfo.goods.status == "down") {

pageD/commodityManage/component/screenPopup.vue

@@ -5,13 +5,13 @@
         <view class="search">
           <u--input
             v-model="searchData.keywords"
-            placeholder="搜索商品名称"
+            :placeholder="i18n.searchGoods"
             shape="circle"
             prefixIcon="search"
             prefixIconStyle="font-size: 22px;color: #909399"
           ></u--input>
           <view class="screen" @click="openPopup">
-            筛选
+            {{ i18n.screen }}
             <image
               class="screen-icon"
               src="../../../static/mine/335.png"
@@ -26,38 +26,44 @@
               class="tab"
               @click="tabSwitch('')"
             >
-              全部
+              {{ i18n.all }}
             </view>
             <view
               :class="{ commodity: followPopup == 'normal' }"
               class="tab"
               @click="tabSwitch('normal')"
             >
-              已上架
+              {{ i18n.alreadyListed }}
             </view>
             <view
               :class="{ commodity: followPopup == 'down' }"
               class="tab"
               @click="tabSwitch('down')"
             >
-              已下架
+              {{ i18n.removed }}
             </view>
           </view>
         </view>
         <view class="btn-list">
-          <view :class="{ 'select-tab': selectTab == 0 }" @click="selected(0)"
-            >我的商品</view
+          <view
+            :class="{ 'select-tab': selectTab == 0 }"
+            @click="selected(0)"
+            >{{ i18n.myGoods }}</view
           >
-          <view :class="{ 'select-tab': selectTab == 1 }" @click="selected(1)"
-            >供应链商品</view
+          <view
+            :class="{ 'select-tab': selectTab == 1 }"
+            @click="selected(1)"
+            >{{ i18n.supplyChain }}</view
           >
-          <view :class="{ 'select-tab': selectTab == 2 }" @click="selected(2)"
-            >平台自营商品</view
+          <view
+            :class="{ 'select-tab': selectTab == 2 }"
+            @click="selected(2)"
+            >{{ i18n.operatedProducts }}</view
           >
         </view>
         <view class="reset-config">
-          <button class="reset" @click="close">重置</button
-          ><button class="config" @click="confirm">确定</button>
+          <button class="reset" @click="close">{{ i18n.reset }}</button
+          ><button class="config" @click="confirm">{{ i18n.enter }}</button>
         </view>
       </view>
     </u-popup>
@@ -87,6 +93,11 @@ export default {
       default: false,
     },
   },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
   watch: {
     //监听横向tab栏的数据，同步父组件和子组件横向tab栏的状态
     follow(newVal) {

pageD/components/goodsInformation.vue

@@ -9,12 +9,14 @@
           (itemInfo.review_status != 1 || itemInfo.status != 'normal')
         "
       >
-        <view class="text-1" v-if="itemInfo.review_status == 0"> 审核中 </view>
+        <view class="text-1" v-if="itemInfo.review_status == 0">
+          {{ i18n.inReview }}
+        </view>
         <view class="text-1" v-else-if="itemInfo.review_status == 2">
-          审核失败
+          {{ i18n.auditFailed }}
         </view>
         <view class="text-1" v-else-if="itemInfo.status == 'down'">
-          已下架
+          {{ i18n.removed }}
         </view>
       </view>
       <view class="content-right">
@@ -23,28 +25,38 @@
             class="_label"
             v-if="!productAndCommodity && itemInfo.source == 2"
           >
-            供应商
+            {{ i18n.supplier }}
           </view>
           <view
             class="_label"
             style="background-color: #f83224"
             v-if="!productAndCommodity && itemInfo.source == 1"
           >
-            自营
+            {{ i18n.selfSupport }}
           </view>
           <view
             class="_label"
             v-if="!productAndCommodity && itemInfo.source == 0"
           >
-            团长
+            {{ i18n.team }}
           </view>
           <view class="title" v-if="productAndCommodity == 'product'">
-            {{ itemInfo.name_cn }}
+            <text v-if="language == 'zh-CN'"> {{ itemInfo.name_cn }}</text>
+            <text v-if="language == 'en-US'"> {{ itemInfo.name_en }}</text>
+            <text v-if="language == 'es-ES'"> {{ itemInfo.name_es }}</text>
+            <text v-if="language == 'it-IT'"> {{ itemInfo.name_ita }}</text>
           </view>
-          <view class="title" v-else>{{ itemInfo.name_cn }}</view>
+          <view class="title" v-else>
+            <text v-if="language == 'zh-CN'"> {{ itemInfo.name_cn }}</text>
+            <text v-if="language == 'en-US'"> {{ itemInfo.name_en }}</text>
+            <text v-if="language == 'es-ES'"> {{ itemInfo.name_es }}</text>
+            <text v-if="language == 'it-IT'">
+              {{ itemInfo.name_ita }}</text
+            ></view
+          >
         </view>
         <view class="inventory" v-if="productAndCommodity">
-          <text>库存：</text>
+          <text>{{ i18n.inventory }}：</text>
           <text>{{ itemInfo.stock }}</text>
         </view>
         <view class="inventory" v-else>
@@ -83,9 +95,11 @@
         @click.stop="$emit('goodsUpDown', 'down', itemInfo)"
         v-if="itemInfo.review_status == 1 && itemInfo.status == 'normal'"
       >
-        下架商品
+        {{ i18n.removeProducts }}
+      </button>
+      <button class="btn-1" v-if="itemInfo.review_status == 0">
+        {{ i18n.details }}
       </button>
-      <button class="btn-1" v-if="itemInfo.review_status == 0">查看详情</button>
       <!-- <button class="btn-2" v-if="itemInfo.review_status == 2">重新提交</button> -->
       <!-- <button class="btn-1" v-if="itemInfo.status == 'down'">编辑</button> -->
       <button
@@ -97,7 +111,7 @@
           itemInfo.status == 'down'
         "
       >
-        上架商品
+        {{ i18n.listingProducts }}
       </button>
     </view>
     <view class="btn-list" v-if="!batch && productAndCommodity == 'commodity'">
@@ -106,12 +120,12 @@
         v-if="status == 1"
         @click.stop="$emit('openDiscountsPopup', obj)"
       >
-        我要打折
+        {{ i18n.wantDiscount }}
       </button>
-      <button class="btn-1" v-if="status == 1">下架</button>
-      <button class="btn-1" v-if="status == 4">删除</button>
-      <button class="btn-1" v-if="status == 4">商家</button>
-      <button class="btn-2" v-if="status == 3">编辑</button>
+      <button class="btn-1" v-if="status == 1">{{ i18n.offShelf }}</button>
+      <button class="btn-1" v-if="status == 4">{{ i18n.delete }}</button>
+      <button class="btn-1" v-if="status == 4">{{ i18n.business }}</button>
+      <button class="btn-2" v-if="status == 3">{{ i18n.edit }}</button>
     </view>
   </view>
 </template>
@@ -137,6 +151,11 @@ export default {
       typeof: Boolean,
       default: false,
     },
+    //语言
+    language: {
+      typeof: String,
+      default: "",
+    },
   },
   watch: {},
   data() {
@@ -155,6 +174,9 @@ export default {
         return "padding: 28rpx 20rpx 20rpx;";
       }
     },
+    i18n() {
+      return this.$t("index");
+    },
   },
 };
 </script>

pageD/orderInformation/orderInformation.vue

@@ -178,10 +178,7 @@
           : i18n.paid
       }}</text>
       <text style="color: #f83224; font-weight: 600">{{
-        orderInformation.actual_price &&
-        Number(orderInformation.actual_price) != 0
-          ? orderInformation.actual_price
-          : orderInformation.estimated_price
+        orderInformation.paid_amount
       }}</text>
     </view>
     <view

pageD/platformProducts/platformProducts.vue

@@ -2,7 +2,7 @@
   <view class="page">
     <u--input
       style="background: #f4f4f4"
-      placeholder="搜索商品名称"
+      :placeholder="i18n.searchGoods"
       shape="circle"
       prefixIcon="search"
       prefixIconStyle="font-size: 22px;color: #909399"
@@ -10,7 +10,12 @@
       v-model="keyword"
     ></u--input>
     <view class="content-list" v-for="item in goodsList" :key="item.id">
-      <GoodsInformation status="1" :itemInfo="item" @toDetail="toDetail" />
+      <GoodsInformation
+        status="1"
+        :itemInfo="item"
+        @toDetail="toDetail"
+        :language="language"
+      />
     </view>
   </view>
 </template>
@@ -27,8 +32,14 @@ export default {
       page: 1,
       total: 0,
       keyword: "",
+      language: this._language, //当前用户选择的语言
     };
   },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
   methods: {
     //搜索
     search(e) {
@@ -85,7 +96,7 @@ export default {
   mounted() {
     this.getProductsList(0);
     uni.setNavigationBarTitle({
-      title: "平台商品库",
+      title: this.i18n.platformGoods,
     });
   },
 };

unpackage/dist/dev/mp-weixin/pageD/afterSalesDetail/component/applicationInformation.js

@@ -1,10 +1,18 @@
+<<<<<<< HEAD
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesDetail/component/applicationInformation"],{1387:function(n,e,t){"use strict";t.r(e);var r=t(1388),u=t(1390);for(var o in u)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(o);t(1392);var a,i=t(37),c=Object(i["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"6fe10644",null,!1,r["components"],a);c.options.__file="pageD/afterSalesDetail/component/applicationInformation.vue",e["default"]=c.exports},1388:function(n,e,t){"use strict";t.r(e);var r=t(1389);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1389:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return a})),t.d(e,"recyclableRender",(function(){return o})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},o=!1,a=[];u._withStripped=!0},1390:function(n,e,t){"use strict";t.r(e);var r=t(1391),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1391:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{orderInformation:{typeof:Object,default:function(){return{}}},refuseImg:{typeof:Array,default:function(){return[]}}},data:function(){return{}}};e.default=r},1392:function(n,e,t){"use strict";t.r(e);var r=t(1393),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1393:function(n,e,t){}}]);
+=======
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesDetail/component/applicationInformation"],{1389:function(n,e,t){"use strict";t.r(e);var r=t(1390),u=t(1392);for(var o in u)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(o);t(1394);var a,i=t(37),c=Object(i["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"6fe10644",null,!1,r["components"],a);c.options.__file="pageD/afterSalesDetail/component/applicationInformation.vue",e["default"]=c.exports},1390:function(n,e,t){"use strict";t.r(e);var r=t(1391);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1391:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return a})),t.d(e,"recyclableRender",(function(){return o})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},o=!1,a=[];u._withStripped=!0},1392:function(n,e,t){"use strict";t.r(e);var r=t(1393),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1393:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{orderInformation:{typeof:Object,default:function(){return{}}},refuseImg:{typeof:Array,default:function(){return[]}}},data:function(){return{}}};e.default=r},1394:function(n,e,t){"use strict";t.r(e);var r=t(1395),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1395:function(n,e,t){}}]);
+>>>>>>> b4f88a94ec213f6f87e027b272caa8b5d7072a9f
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/pageD/afterSalesDetail/component/applicationInformation.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/afterSalesDetail/component/applicationInformation-create-component',
     {
         'pageD/afterSalesDetail/component/applicationInformation-create-component':(function(module, exports, __webpack_require__){
+<<<<<<< HEAD
+            __webpack_require__('2')['createComponent'](__webpack_require__(1387))
+=======
             __webpack_require__('2')['createComponent'](__webpack_require__(1389))
+>>>>>>> b4f88a94ec213f6f87e027b272caa8b5d7072a9f
         })
     },
     [['pageD/afterSalesDetail/component/applicationInformation-create-component']]

unpackage/dist/dev/mp-weixin/pageD/commodityManage/component/batchDiscountPopup.wxml

@@ -1 +1 @@
-<u-popup vue-id="72713cc4-1" show="{{show}}" mode="bottom" round="{{10}}" closeable="{{true}}" data-event-opts="{{[['^close',[['close']]]]}}" bind:close="__e" class="data-v-c9e2a730" bind:__l="__l" vue-slots="{{['default']}}"><view class="content data-v-c9e2a730"><view class="goods-information data-v-c9e2a730">我要打折</view><view class="discount data-v-c9e2a730"><view class="data-v-c9e2a730">折扣</view><u--input vue-id="{{('72713cc4-2')+','+('72713cc4-1')}}" inputAlign="right" placeholder="打8折请输入80,以原价计算" border="none" type="number" maxlength="2" value="{{value}}" data-event-opts="{{[['^change',[['change']]],['^input',[['__set_model',['','value','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-c9e2a730" bind:__l="__l"></u--input><view style="margin-left:10rpx;" class="data-v-c9e2a730">%</view></view><button data-event-opts="{{[['tap',[['confirm',['$event']]]]]}}" class="btn data-v-c9e2a730" bindtap="__e">确定</button></view></u-popup>
+<u-popup vue-id="72713cc4-1" show="{{show}}" mode="bottom" round="{{10}}" closeable="{{true}}" data-event-opts="{{[['^close',[['close']]]]}}" bind:close="__e" class="data-v-c9e2a730" bind:__l="__l" vue-slots="{{['default']}}"><view class="content data-v-c9e2a730"><view class="goods-information data-v-c9e2a730">{{''+i18n.wantDiscount}}</view><view class="discount data-v-c9e2a730"><view class="data-v-c9e2a730">{{''+i18n.discount+''}}</view><u--input vue-id="{{('72713cc4-2')+','+('72713cc4-1')}}" inputAlign="right" placeholder="{{i18n.originalPrice}}" border="none" type="number" maxlength="2" value="{{value}}" data-event-opts="{{[['^change',[['change']]],['^input',[['__set_model',['','value','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-c9e2a730" bind:__l="__l"></u--input><view style="margin-left:10rpx;" class="data-v-c9e2a730">%</view></view><button data-event-opts="{{[['tap',[['confirm',['$event']]]]]}}" class="btn data-v-c9e2a730" bindtap="__e">{{i18n.enter}}</button></view></u-popup>

unpackage/dist/dev/mp-weixin/pageD/commodityManage/component/discountsPopup.wxml

@@ -1 +1 @@
-<u-popup vue-id="1bfbde15-1" show="{{show}}" mode="bottom" round="{{10}}" closeable="{{true}}" data-event-opts="{{[['^close',[['close']]]]}}" bind:close="__e" class="data-v-19ad4511" bind:__l="__l" vue-slots="{{['default']}}"><view class="content data-v-19ad4511"><block wx:if="{{selectGoodsInformation.goods}}"><view class="goods-information data-v-19ad4511"><image class="goods-img data-v-19ad4511" src="{{selectGoodsInformation.goods.image}}" mode></image><view class="goods-right data-v-19ad4511"><view class="title data-v-19ad4511">{{''+selectGoodsInformation.goods.name_cn+''}}</view><view class="price data-v-19ad4511">{{'￥'+selectGoodsInformation.goods.discount_price+''}}</view></view></view></block><view class="discount data-v-19ad4511"><view class="data-v-19ad4511">折扣</view><u--input vue-id="{{('1bfbde15-2')+','+('1bfbde15-1')}}" inputAlign="right" placeholder="打8折请输入80,以原价计算" border="none" type="number" maxlength="3" value="{{value}}" data-event-opts="{{[['^change',[['change']]],['^input',[['__set_model',['','value','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-19ad4511" bind:__l="__l"></u--input><view style="margin-left:10rpx;" class="data-v-19ad4511">%</view></view><block wx:if="{{value}}"><view class="text-list data-v-19ad4511"><view class="_text-1 data-v-19ad4511"><text class="data-v-19ad4511">折扣价</text><text class="data-v-19ad4511">{{"￥"+discountPrice}}</text></view><view class="_text-1 data-v-19ad4511"><text class="data-v-19ad4511">优惠</text><text style="color:#f83224;" class="data-v-19ad4511">{{"-￥"+preferential}}</text></view></view></block><button data-event-opts="{{[['tap',[['confirm',['$event']]]]]}}" class="btn data-v-19ad4511" bindtap="__e">确定</button></view></u-popup>
+<u-popup vue-id="1bfbde15-1" show="{{show}}" mode="bottom" round="{{10}}" closeable="{{true}}" data-event-opts="{{[['^close',[['close']]]]}}" bind:close="__e" class="data-v-19ad4511" bind:__l="__l" vue-slots="{{['default']}}"><view class="content data-v-19ad4511"><block wx:if="{{selectGoodsInformation.goods}}"><view class="goods-information data-v-19ad4511"><image class="goods-img data-v-19ad4511" src="{{selectGoodsInformation.goods.image}}" mode></image><view class="goods-right data-v-19ad4511"><view class="title data-v-19ad4511">{{''+selectGoodsInformation.goods.name_cn+''}}</view><view class="price data-v-19ad4511">{{'￥'+selectGoodsInformation.goods.discount_price+''}}</view></view></view></block><view class="discount data-v-19ad4511"><view class="data-v-19ad4511">{{''+i18n.discount+''}}</view><u--input vue-id="{{('1bfbde15-2')+','+('1bfbde15-1')}}" inputAlign="right" placeholder="{{i18n.originalPrice}}" border="none" type="number" maxlength="3" value="{{value}}" data-event-opts="{{[['^change',[['change']]],['^input',[['__set_model',['','value','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-19ad4511" bind:__l="__l"></u--input><view style="margin-left:10rpx;" class="data-v-19ad4511">%</view></view><block wx:if="{{value}}"><view class="text-list data-v-19ad4511"><view class="_text-1 data-v-19ad4511"><text class="data-v-19ad4511">{{i18n.Discounted}}</text><text class="data-v-19ad4511">{{"￥"+discountPrice}}</text></view><view class="_text-1 data-v-19ad4511"><text class="data-v-19ad4511">{{i18n.preferential}}</text><text style="color:#f83224;" class="data-v-19ad4511">{{"-￥"+preferential}}</text></view></view></block><button data-event-opts="{{[['tap',[['confirm',['$event']]]]]}}" class="btn data-v-19ad4511" bindtap="__e">{{i18n.enter}}</button></view></u-popup>

unpackage/dist/dev/mp-weixin/pageD/components/selectExpress.js

@@ -1,10 +1,18 @@
+<<<<<<< HEAD
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/components/selectExpress"],{1394:function(e,n,t){"use strict";t.r(n);var r=t(1395),u=t(1397);for(var c in u)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(c);t(1399);var o,f=t(37),i=Object(f["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"249ccb63",null,!1,r["components"],o);i.options.__file="pageD/components/selectExpress.vue",n["default"]=i.exports},1395:function(e,n,t){"use strict";t.r(n);var r=t(1396);t.d(n,"render",(function(){return r["render"]})),t.d(n,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(n,"components",(function(){return r["components"]}))},1396:function(e,n,t){"use strict";var r;t.r(n),t.d(n,"render",(function(){return u})),t.d(n,"staticRenderFns",(function(){return o})),t.d(n,"recyclableRender",(function(){return c})),t.d(n,"components",(function(){return r}));var u=function(){var e=this,n=e.$createElement;e._self._c},c=!1,o=[];u._withStripped=!0},1397:function(e,n,t){"use strict";t.r(n);var r=t(1398),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(c);n["default"]=u.a},1398:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={name:"selectExpress",props:{show:{typeof:Boolean,default:!1},filterList:{typeof:Array,default:function(){return{}}},className:{typeof:String,default:""}}};n.default=r},1399:function(e,n,t){"use strict";t.r(n);var r=t(1400),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(c);n["default"]=u.a},1400:function(e,n,t){}}]);
+=======
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/components/selectExpress"],{1396:function(e,n,t){"use strict";t.r(n);var r=t(1397),u=t(1399);for(var c in u)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(c);t(1401);var o,f=t(37),i=Object(f["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"249ccb63",null,!1,r["components"],o);i.options.__file="pageD/components/selectExpress.vue",n["default"]=i.exports},1397:function(e,n,t){"use strict";t.r(n);var r=t(1398);t.d(n,"render",(function(){return r["render"]})),t.d(n,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(n,"components",(function(){return r["components"]}))},1398:function(e,n,t){"use strict";var r;t.r(n),t.d(n,"render",(function(){return u})),t.d(n,"staticRenderFns",(function(){return o})),t.d(n,"recyclableRender",(function(){return c})),t.d(n,"components",(function(){return r}));var u=function(){var e=this,n=e.$createElement;e._self._c},c=!1,o=[];u._withStripped=!0},1399:function(e,n,t){"use strict";t.r(n);var r=t(1400),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(c);n["default"]=u.a},1400:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={name:"selectExpress",props:{show:{typeof:Boolean,default:!1},filterList:{typeof:Array,default:function(){return{}}},className:{typeof:String,default:""}}};n.default=r},1401:function(e,n,t){"use strict";t.r(n);var r=t(1402),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(c);n["default"]=u.a},1402:function(e,n,t){}}]);
+>>>>>>> b4f88a94ec213f6f87e027b272caa8b5d7072a9f
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pageD/components/selectExpress.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/components/selectExpress-create-component',
     {
         'pageD/components/selectExpress-create-component':(function(module, exports, __webpack_require__){
+<<<<<<< HEAD
+            __webpack_require__('2')['createComponent'](__webpack_require__(1394))
+=======
             __webpack_require__('2')['createComponent'](__webpack_require__(1396))
+>>>>>>> b4f88a94ec213f6f87e027b272caa8b5d7072a9f
         })
     },
     [['pageD/components/selectExpress-create-component']]

unpackage/dist/dev/mp-weixin/pageD/homepage/component/goodsCard.js

@@ -1,10 +1,18 @@
+<<<<<<< HEAD
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/homepage/component/goodsCard"],{1401:function(n,e,t){"use strict";t.r(e);var r=t(1402),o=t(1404);for(var u in o)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(u);t(1406);var c,i=t(37),a=Object(i["default"])(o["default"],r["render"],r["staticRenderFns"],!1,null,"c698a5ca",null,!1,r["components"],c);a.options.__file="pageD/homepage/component/goodsCard.vue",e["default"]=a.exports},1402:function(n,e,t){"use strict";t.r(e);var r=t(1403);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1403:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return o})),t.d(e,"staticRenderFns",(function(){return c})),t.d(e,"recyclableRender",(function(){return u})),t.d(e,"components",(function(){return r}));var o=function(){var n=this,e=n.$createElement,t=(n._self._c,n.itemInfo.goods.price.split(".")),r=n.itemInfo.goods.price.split(".");n.$mp.data=Object.assign({},{$root:{g0:t,g1:r}})},u=!1,c=[];o._withStripped=!0},1404:function(n,e,t){"use strict";t.r(e);var r=t(1405),o=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(u);e["default"]=o.a},1405:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{itemInfo:{typeof:Object,default:function(){return{}}},language:{typeof:String,default:""}},computed:{i18n:function(){return this.$t("index")}},data:function(){return{}}};e.default=r},1406:function(n,e,t){"use strict";t.r(e);var r=t(1407),o=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(u);e["default"]=o.a},1407:function(n,e,t){}}]);
+=======
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/homepage/component/goodsCard"],{1403:function(n,e,t){"use strict";t.r(e);var r=t(1404),o=t(1406);for(var u in o)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(u);t(1408);var c,i=t(37),a=Object(i["default"])(o["default"],r["render"],r["staticRenderFns"],!1,null,"c698a5ca",null,!1,r["components"],c);a.options.__file="pageD/homepage/component/goodsCard.vue",e["default"]=a.exports},1404:function(n,e,t){"use strict";t.r(e);var r=t(1405);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1405:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return o})),t.d(e,"staticRenderFns",(function(){return c})),t.d(e,"recyclableRender",(function(){return u})),t.d(e,"components",(function(){return r}));var o=function(){var n=this,e=n.$createElement,t=(n._self._c,n.itemInfo.goods.price.split(".")),r=n.itemInfo.goods.price.split(".");n.$mp.data=Object.assign({},{$root:{g0:t,g1:r}})},u=!1,c=[];o._withStripped=!0},1406:function(n,e,t){"use strict";t.r(e);var r=t(1407),o=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(u);e["default"]=o.a},1407:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{itemInfo:{typeof:Object,default:function(){return{}}},language:{typeof:String,default:""}},computed:{i18n:function(){return this.$t("index")}},data:function(){return{}}};e.default=r},1408:function(n,e,t){"use strict";t.r(e);var r=t(1409),o=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(u);e["default"]=o.a},1409:function(n,e,t){}}]);
+>>>>>>> b4f88a94ec213f6f87e027b272caa8b5d7072a9f
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/pageD/homepage/component/goodsCard.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/homepage/component/goodsCard-create-component',
     {
         'pageD/homepage/component/goodsCard-create-component':(function(module, exports, __webpack_require__){
+<<<<<<< HEAD
+            __webpack_require__('2')['createComponent'](__webpack_require__(1401))
+=======
             __webpack_require__('2')['createComponent'](__webpack_require__(1403))
+>>>>>>> b4f88a94ec213f6f87e027b272caa8b5d7072a9f
         })
     },
     [['pageD/homepage/component/goodsCard-create-component']]

unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/component/commodity.js

@@ -1,10 +1,18 @@
+<<<<<<< HEAD
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/newBulitOrder/component/commodity"],{1415:function(n,e,t){"use strict";t.r(e);var r=t(1416),u=t(1418);for(var o in u)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(o);t(1420);var c,i=t(37),d=Object(i["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"4ed8fbfe",null,!1,r["components"],c);d.options.__file="pageD/newBulitOrder/component/commodity.vue",e["default"]=d.exports},1416:function(n,e,t){"use strict";t.r(e);var r=t(1417);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1417:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return c})),t.d(e,"recyclableRender",(function(){return o})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},o=!1,c=[];u._withStripped=!0},1418:function(n,e,t){"use strict";t.r(e);var r=t(1419),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1419:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{goodsList:{typeof:Array,default:function(){return[]}},goodsValue:{typeof:Number,default:0}}};e.default=r},1420:function(n,e,t){"use strict";t.r(e);var r=t(1421),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1421:function(n,e,t){}}]);
+=======
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/newBulitOrder/component/commodity"],{1417:function(n,e,t){"use strict";t.r(e);var r=t(1418),u=t(1420);for(var o in u)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(o);t(1422);var c,i=t(37),d=Object(i["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"4ed8fbfe",null,!1,r["components"],c);d.options.__file="pageD/newBulitOrder/component/commodity.vue",e["default"]=d.exports},1418:function(n,e,t){"use strict";t.r(e);var r=t(1419);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1419:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return c})),t.d(e,"recyclableRender",(function(){return o})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},o=!1,c=[];u._withStripped=!0},1420:function(n,e,t){"use strict";t.r(e);var r=t(1421),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1421:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{goodsList:{typeof:Array,default:function(){return[]}},goodsValue:{typeof:Number,default:0}}};e.default=r},1422:function(n,e,t){"use strict";t.r(e);var r=t(1423),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1423:function(n,e,t){}}]);
+>>>>>>> b4f88a94ec213f6f87e027b272caa8b5d7072a9f
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/pageD/newBulitOrder/component/commodity.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/newBulitOrder/component/commodity-create-component',
     {
         'pageD/newBulitOrder/component/commodity-create-component':(function(module, exports, __webpack_require__){
+<<<<<<< HEAD
+            __webpack_require__('2')['createComponent'](__webpack_require__(1415))
+=======
             __webpack_require__('2')['createComponent'](__webpack_require__(1417))
+>>>>>>> b4f88a94ec213f6f87e027b272caa8b5d7072a9f
         })
     },
     [['pageD/newBulitOrder/component/commodity-create-component']]

unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/component/commodity.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/component/goodsInformation.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/component/nextLogistics.json

@@ -1,7 +1,7 @@
 {
-  "component": true,
   "usingComponents": {
     "u-popup": "/uview-ui/components/u-popup/u-popup",
     "u-icon": "/uview-ui/components/u-icon/u-icon"
-  }
+  },
+  "component": true
 }

unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/component/recommendGoods.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/component/selectLogistics.json

@@ -1,7 +1,7 @@
 {
-  "component": true,
   "usingComponents": {
     "u-popup": "/uview-ui/components/u-popup/u-popup",
     "u-icon": "/uview-ui/components/u-icon/u-icon"
-  }
+  },
+  "component": true
 }

unpackage/dist/dev/mp-weixin/pageD/orderDetail/component/commodityDetail.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/dev/mp-weixin/pageD/platformProducts/platformProducts.wxml

@@ -1 +1 @@
-<view class="page data-v-24b3f177"><u--input style="background:#f4f4f4;" vue-id="71cabe6f-1" placeholder="搜索商品名称" shape="circle" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" value="{{keyword}}" data-event-opts="{{[['^change',[['search']]],['^input',[['__set_model',['','keyword','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-24b3f177" bind:__l="__l"></u--input><block wx:for="{{goodsList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view class="content-list data-v-24b3f177"><goods-information vue-id="{{'71cabe6f-2-'+__i0__}}" status="1" itemInfo="{{item}}" data-event-opts="{{[['^toDetail',[['toDetail']]]]}}" bind:toDetail="__e" class="data-v-24b3f177" bind:__l="__l"></goods-information></view></block></view>
+<view class="page data-v-24b3f177"><u--input style="background:#f4f4f4;" vue-id="71cabe6f-1" placeholder="{{i18n.searchGoods}}" shape="circle" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" value="{{keyword}}" data-event-opts="{{[['^change',[['search']]],['^input',[['__set_model',['','keyword','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-24b3f177" bind:__l="__l"></u--input><block wx:for="{{goodsList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view class="content-list data-v-24b3f177"><goods-information vue-id="{{'71cabe6f-2-'+__i0__}}" status="1" itemInfo="{{item}}" language="{{language}}" data-event-opts="{{[['^toDetail',[['toDetail']]]]}}" bind:toDetail="__e" class="data-v-24b3f177" bind:__l="__l"></goods-information></view></block></view>

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -4,6 +4,20 @@
     "miniprogram": {
       "list": [
         {
+          "name": "pageD/commodityManage/commodityManage",
+          "pathName": "pageD/commodityManage/commodityManage",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pageC/orderFormDetail/orderFormDetail",
+          "pathName": "pageC/orderFormDetail/orderFormDetail",
+          "query": "orderId=472",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
           "name": "pageC/recharge/recharge",
           "pathName": "pageC/recharge/recharge",
           "query": "",

unpackage/dist/dev/mp-weixin/uview-ui/components/u--input/u--input.js

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["uview-ui/components/u--input/u--input"],{993:function(n,e,t){"use strict";t.r(e);var u=t(994),r=t(996);for(var i in r)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(i);var c,o=t(37),f=Object(o["default"])(r["default"],u["render"],u["staticRenderFns"],!1,null,null,null,!1,u["components"],c);f.options.__file="uview-ui/components/u--input/u--input.vue",e["default"]=f.exports},994:function(n,e,t){"use strict";t.r(e);var u=t(995);t.d(e,"render",(function(){return u["render"]})),t.d(e,"staticRenderFns",(function(){return u["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return u["recyclableRender"]})),t.d(e,"components",(function(){return u["components"]}))},995:function(n,e,t){"use strict";var u;t.r(e),t.d(e,"render",(function(){return r})),t.d(e,"staticRenderFns",(function(){return c})),t.d(e,"recyclableRender",(function(){return i})),t.d(e,"components",(function(){return u}));var r=function(){var n=this,e=n.$createElement;n._self._c;n._isMounted||(n.e0=function(e){return n.$emit("blur",e)},n.e1=function(e){return n.$emit("change",e)},n.e2=function(e){return n.$emit("input",e)},n.e3=function(e){return n.$emit("confirm",e)})},i=!1,c=[];r._withStripped=!0},996:function(n,e,t){"use strict";t.r(e);var u=t(997),r=t.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(i);e["default"]=r.a},997:function(n,e,t){"use strict";(function(n){var u=t(4);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r=u(t(998)),i=function(){t.e("uview-ui/components/u-input/u-input").then(function(){return resolve(t(1514))}.bind(null,t)).catch(t.oe)},c={name:"u--input",mixins:[n.$u.mpMixin,r.default,n.$u.mixin],components:{uvInput:i}};e.default=c}).call(this,t(2)["default"])}}]);
+=======
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["uview-ui/components/u--input/u--input"],{993:function(n,e,t){"use strict";t.r(e);var u=t(994),r=t(996);for(var i in r)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(i);var c,o=t(37),f=Object(o["default"])(r["default"],u["render"],u["staticRenderFns"],!1,null,null,null,!1,u["components"],c);f.options.__file="uview-ui/components/u--input/u--input.vue",e["default"]=f.exports},994:function(n,e,t){"use strict";t.r(e);var u=t(995);t.d(e,"render",(function(){return u["render"]})),t.d(e,"staticRenderFns",(function(){return u["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return u["recyclableRender"]})),t.d(e,"components",(function(){return u["components"]}))},995:function(n,e,t){"use strict";var u;t.r(e),t.d(e,"render",(function(){return r})),t.d(e,"staticRenderFns",(function(){return c})),t.d(e,"recyclableRender",(function(){return i})),t.d(e,"components",(function(){return u}));var r=function(){var n=this,e=n.$createElement;n._self._c;n._isMounted||(n.e0=function(e){return n.$emit("blur",e)},n.e1=function(e){return n.$emit("change",e)},n.e2=function(e){return n.$emit("input",e)},n.e3=function(e){return n.$emit("confirm",e)})},i=!1,c=[];r._withStripped=!0},996:function(n,e,t){"use strict";t.r(e);var u=t(997),r=t.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(i);e["default"]=r.a},997:function(n,e,t){"use strict";(function(n){var u=t(4);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r=u(t(998)),i=function(){t.e("uview-ui/components/u-input/u-input").then(function(){return resolve(t(1516))}.bind(null,t)).catch(t.oe)},c={name:"u--input",mixins:[n.$u.mpMixin,r.default,n.$u.mixin],components:{uvInput:i}};e.default=c}).call(this,t(2)["default"])}}]);
+>>>>>>> b4f88a94ec213f6f87e027b272caa8b5d7072a9f
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/uview-ui/components/u--input/u--input.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'uview-ui/components/u--input/u--input-create-component',

unpackage/dist/dev/mp-weixin/uview-ui/components/u--text/u--text.js

@@ -1,10 +1,18 @@
+<<<<<<< HEAD
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["uview-ui/components/u--text/u--text"],{1585:function(n,e,t){"use strict";t.r(e);var u=t(1586),r=t(1588);for(var i in r)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(i);var o,c=t(37),a=Object(c["default"])(r["default"],u["render"],u["staticRenderFns"],!1,null,null,null,!1,u["components"],o);a.options.__file="uview-ui/components/u--text/u--text.vue",e["default"]=a.exports},1586:function(n,e,t){"use strict";t.r(e);var u=t(1587);t.d(e,"render",(function(){return u["render"]})),t.d(e,"staticRenderFns",(function(){return u["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return u["recyclableRender"]})),t.d(e,"components",(function(){return u["components"]}))},1587:function(n,e,t){"use strict";var u;t.r(e),t.d(e,"render",(function(){return r})),t.d(e,"staticRenderFns",(function(){return o})),t.d(e,"recyclableRender",(function(){return i})),t.d(e,"components",(function(){return u}));var r=function(){var n=this,e=n.$createElement;n._self._c},i=!1,o=[];r._withStripped=!0},1588:function(n,e,t){"use strict";t.r(e);var u=t(1589),r=t.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(i);e["default"]=r.a},1589:function(n,e,t){"use strict";(function(n){var u=t(4);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r=u(t(1590)),i=function(){Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-text/u-text")]).then(function(){return resolve(t(1591))}.bind(null,t)).catch(t.oe)},o={name:"u--text",mixins:[n.$u.mpMixin,r.default,n.$u.mixin],components:{uvText:i}};e.default=o}).call(this,t(2)["default"])}}]);
+=======
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["uview-ui/components/u--text/u--text"],{1587:function(n,e,t){"use strict";t.r(e);var u=t(1588),r=t(1590);for(var i in r)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(i);var o,c=t(37),a=Object(c["default"])(r["default"],u["render"],u["staticRenderFns"],!1,null,null,null,!1,u["components"],o);a.options.__file="uview-ui/components/u--text/u--text.vue",e["default"]=a.exports},1588:function(n,e,t){"use strict";t.r(e);var u=t(1589);t.d(e,"render",(function(){return u["render"]})),t.d(e,"staticRenderFns",(function(){return u["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return u["recyclableRender"]})),t.d(e,"components",(function(){return u["components"]}))},1589:function(n,e,t){"use strict";var u;t.r(e),t.d(e,"render",(function(){return r})),t.d(e,"staticRenderFns",(function(){return o})),t.d(e,"recyclableRender",(function(){return i})),t.d(e,"components",(function(){return u}));var r=function(){var n=this,e=n.$createElement;n._self._c},i=!1,o=[];r._withStripped=!0},1590:function(n,e,t){"use strict";t.r(e);var u=t(1591),r=t.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(i);e["default"]=r.a},1591:function(n,e,t){"use strict";(function(n){var u=t(4);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r=u(t(1592)),i=function(){Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-text/u-text")]).then(function(){return resolve(t(1593))}.bind(null,t)).catch(t.oe)},o={name:"u--text",mixins:[n.$u.mpMixin,r.default,n.$u.mixin],components:{uvText:i}};e.default=o}).call(this,t(2)["default"])}}]);
+>>>>>>> b4f88a94ec213f6f87e027b272caa8b5d7072a9f
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/uview-ui/components/u--text/u--text.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'uview-ui/components/u--text/u--text-create-component',
     {
         'uview-ui/components/u--text/u--text-create-component':(function(module, exports, __webpack_require__){
+<<<<<<< HEAD
+            __webpack_require__('2')['createComponent'](__webpack_require__(1585))
+=======
             __webpack_require__('2')['createComponent'](__webpack_require__(1587))
+>>>>>>> b4f88a94ec213f6f87e027b272caa8b5d7072a9f
         })
     },
     [['uview-ui/components/u--text/u--text-create-component']]

unpackage/dist/dev/mp-weixin/uview-ui/components/u--textarea/u--textarea.js

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["uview-ui/components/u--textarea/u--textarea"],{1215:function(e,n,t){"use strict";t.r(n);var r=t(1216),u=t(1218);for(var i in u)["default"].indexOf(i)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(i);var c,o=t(37),a=Object(o["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],c);a.options.__file="uview-ui/components/u--textarea/u--textarea.vue",n["default"]=a.exports},1216:function(e,n,t){"use strict";t.r(n);var r=t(1217);t.d(n,"render",(function(){return r["render"]})),t.d(n,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(n,"components",(function(){return r["components"]}))},1217:function(e,n,t){"use strict";var r;t.r(n),t.d(n,"render",(function(){return u})),t.d(n,"staticRenderFns",(function(){return c})),t.d(n,"recyclableRender",(function(){return i})),t.d(n,"components",(function(){return r}));var u=function(){var e=this,n=e.$createElement;e._self._c;e._isMounted||(e.e0=function(n){return e.$emit("focus")},e.e1=function(n){return e.$emit("blur")},e.e2=function(n){return e.$emit("linechange",n)},e.e3=function(n){return e.$emit("confirm")},e.e4=function(n){return e.$emit("input",n)},e.e5=function(n){return e.$emit("keyboardheightchange")})},i=!1,c=[];u._withStripped=!0},1218:function(e,n,t){"use strict";t.r(n);var r=t(1219),u=t.n(r);for(var i in r)["default"].indexOf(i)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(i);n["default"]=u.a},1219:function(e,n,t){"use strict";(function(e){var r=t(4);Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u=r(t(1220)),i=function(){t.e("uview-ui/components/u-textarea/u-textarea").then(function(){return resolve(t(1562))}.bind(null,t)).catch(t.oe)},c={name:"u--textarea",mixins:[e.$u.mpMixin,u.default,e.$u.mixin],components:{uvTextarea:i}};n.default=c}).call(this,t(2)["default"])}}]);
+=======
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["uview-ui/components/u--textarea/u--textarea"],{1215:function(e,n,t){"use strict";t.r(n);var r=t(1216),u=t(1218);for(var i in u)["default"].indexOf(i)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(i);var c,o=t(37),a=Object(o["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],c);a.options.__file="uview-ui/components/u--textarea/u--textarea.vue",n["default"]=a.exports},1216:function(e,n,t){"use strict";t.r(n);var r=t(1217);t.d(n,"render",(function(){return r["render"]})),t.d(n,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(n,"components",(function(){return r["components"]}))},1217:function(e,n,t){"use strict";var r;t.r(n),t.d(n,"render",(function(){return u})),t.d(n,"staticRenderFns",(function(){return c})),t.d(n,"recyclableRender",(function(){return i})),t.d(n,"components",(function(){return r}));var u=function(){var e=this,n=e.$createElement;e._self._c;e._isMounted||(e.e0=function(n){return e.$emit("focus")},e.e1=function(n){return e.$emit("blur")},e.e2=function(n){return e.$emit("linechange",n)},e.e3=function(n){return e.$emit("confirm")},e.e4=function(n){return e.$emit("input",n)},e.e5=function(n){return e.$emit("keyboardheightchange")})},i=!1,c=[];u._withStripped=!0},1218:function(e,n,t){"use strict";t.r(n);var r=t(1219),u=t.n(r);for(var i in r)["default"].indexOf(i)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(i);n["default"]=u.a},1219:function(e,n,t){"use strict";(function(e){var r=t(4);Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u=r(t(1220)),i=function(){t.e("uview-ui/components/u-textarea/u-textarea").then(function(){return resolve(t(1564))}.bind(null,t)).catch(t.oe)},c={name:"u--textarea",mixins:[e.$u.mpMixin,u.default,e.$u.mixin],components:{uvTextarea:i}};n.default=c}).call(this,t(2)["default"])}}]);
+>>>>>>> b4f88a94ec213f6f87e027b272caa8b5d7072a9f
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/uview-ui/components/u--textarea/u--textarea.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'uview-ui/components/u--textarea/u--textarea-create-component',