冲突

commont/messages.js

@@ -526,6 +526,42 @@ export default {
       applyForTime: "申请时间",
       refundNumber: "退款编号",
       PendingProcessing: "待商家处理",
+      //我的供应链商品
+      supplyChain: "我的供应链商品",
+      removedSuccessfully: "下架成功",
+      successfullyListed: "上架成功",
+      //结果反馈
+      WaitingReview: "审核中，请耐心等待~",
+      failedReview: "未通过，请重新提交信息",
+      rejectReason: "拒绝原因",
+      successfullySettled: "您已入驻成功",
+      goodsRelease: "请访问以下pc端地址进行店铺信息维护以及 商品信息的发布",
+      copyLink: "复制链接",
+      accountNumber: "账号",
+      accountPassword: "密码",
+      resubmit: "重新提交",
+      resultFeedback: "结果反馈",
+      //寄快递
+      warehouseAddress: "跨境中转仓库地址",
+      addressFirst: "请先将包裹寄往这个地址～",
+      pleaseCompany: "请输入快递公司名称",
+      useDelivery: "寄快递",
+      //团长入驻
+      teamSettle: "团长入驻",
+      pleaseName: "请输入真实姓名",
+      IDCard: "身份证号",
+      enterCard: "请输入您的身份证",
+      backCard: "银行卡号",
+      pleaseBackCard: "请输入您的银行卡号",
+      pleasePhone: "请输入手机号",
+      QRCode: "验证码",
+      pleaseQrCode: "请输入短信验证码",
+      getQrCode: "获取验证码",
+      startVerification: "开始人脸识别验证",
+      userServiceAgreement: "用户服务协议",
+      checkFirst: "请先勾选",
+      applicationResult: "申请成功，请等待审核结果",
+      pleaseIdentity: "请先完成身份核验",
     },
   },
   //英语
@@ -1059,6 +1095,44 @@ export default {
       applyForTime: "time",
       refundNumber: "Refund number",
       PendingProcessing: "Pending merchant processing",
+      //我的供应链商品
+      supplyChain: "My supply chain products",
+      removedSuccessfully: "Removed successfully",
+      successfullyListed: "Successfully listed",
+      //结果反馈
+      WaitingReview: "Under review, please be patient and wait~",
+      failedReview: "Failed, please resubmit the information",
+      rejectReason: "Reject Reason",
+      successfullySettled: "You have successfully joined",
+      goodsRelease:
+        "Please visit the following PC address to maintain store information and publish product information",
+      copyLink: "copy link",
+      accountNumber: "account number",
+      accountPassword: "password",
+      resubmit: "resubmit",
+      resultFeedback: "Result feedback",
+      //寄快递
+      warehouseAddress: "Cross border transit warehouse address",
+      addressFirst: "Please send the package to this address first",
+      pleaseCompany: "Please enter the name of the courier company",
+      useDelivery: "use express delivery",
+      //团长入驻
+      teamSettle: "The team leader has settled in",
+      pleaseName: "Please enter your real name",
+      IDCard: "ID",
+      enterCard: "Please enter your ID card",
+      backCard: "Bank card number",
+      pleaseBackCard: "Please enter your bank card number",
+      pleasePhone: "Please enter your phone number",
+      QRCode: "Code",
+      pleaseQrCode: "Please enter the SMS verification code",
+      getQrCode: "Obtain verification code",
+      startVerification: "Start facial recognition verification",
+      userServiceAgreement: "User Service Agreement",
+      checkFirst: "Please check the box first",
+      applicationResult:
+        "Application successful, please wait for the review result",
+      pleaseIdentity: "Please complete the identity verification first",
     },
   },
   // 西班牙
@@ -1602,6 +1676,46 @@ export default {
       refundNumber: "Número de reembolso",
       PendingProcessing:
         "Pendiente de tramitación por parte de los comerciantes",
+      //我的供应链商品
+      supplyChain: "Mis productos de la cadena de suministro",
+      removedSuccessfully: "Retirado con éxito de los estantes",
+      successfullyListed: "éxito en los estantes",
+      //结果反馈
+      WaitingReview: "En la revisión, por favor espere pacientemente.",
+      failedReview: "No aprobado, vuelva a presentar la información",
+      rejectReason: "Razones del rechazo",
+      successfullySettled: "Usted se ha establecido con éxito.",
+      goodsRelease:
+        "Por favor, visite la siguiente dirección de PC para el mantenimiento de la información de la tienda y la publicación de la información del producto.",
+      copyLink: "Copiar enlace",
+      accountNumber: "Cuenta",
+      accountPassword: "Contraseña",
+      resubmit: "Volver a presentar",
+      resultFeedback: "Retroalimentación de resultados",
+      //寄快递
+      warehouseAddress: "Dirección del almacén de tránsito transfronterizo",
+      addressFirst: "Por favor, envíe el paquete a esta dirección primero.",
+      pleaseCompany:
+        "Por favor, introduzca el nombre de la empresa de mensajería.",
+      useDelivery: "Enviar mensajería",
+      //团长入驻
+      teamSettle: "El Jefe del regimiento se instaló",
+      pleaseName: "Por favor, introduzca su nombre real.",
+      IDCard: "Número de identificación",
+      enterCard: "Introduzca su tarjeta de identificación",
+      backCard: "Número de tarjeta bancaria",
+      pleaseBackCard: "Introduzca su número de tarjeta bancaria",
+      pleasePhone: "Por favor, introduzca el número de teléfono móvil",
+      QRCode: "Código de verificación",
+      pleaseQrCode: "Por favor, introduzca el Código de verificación de SMS",
+      getQrCode: "Obtener el Código de verificación",
+      startVerification: "Comienza la verificación de reconocimiento facial",
+      userServiceAgreement: "Protocolo de servicio al usuario",
+      checkFirst: "Por favor, marque primero",
+      applicationResult:
+        "La solicitud es exitosa, por favor espere los resultados de la auditoría.",
+      pleaseIdentity:
+        "Por favor, complete la verificación de identidad primero.",
     },
   },
   //意大利
@@ -2140,6 +2254,45 @@ export default {
       applyForTime: "Tempo di applicazione",
       refundNumber: "Numero della restituzione",
       PendingProcessing: "Elaborazione dei commercianti in sospeso",
+      //我的供应链商品
+      supplyChain: "I miei prodotti della catena di fornitura",
+      removedSuccessfully: "Rimosso con successo",
+      successfullyListed: "Elenco riuscito",
+      //结果反馈
+      WaitingReview:
+        "In fase di revisione, si prega di essere paziente e attendere~",
+      failedReview: "Impossibile, inviare nuovamente le informazioni",
+      rejectReason: "Motivo del rifiuto",
+      successfullySettled: "Hai aderito con successo",
+      goodsRelease:
+        "Visita il seguente indirizzo PC per mantenere le informazioni sul negozio e pubblicare le informazioni sul prodotto",
+      copyLink: "Copia collegamento",
+      accountNumber: "numero di conto",
+      accountPassword: "password",
+      resubmit: "Riprendi",
+      resultFeedback: "Feedback sui risultati",
+      //寄快递
+      warehouseAddress: "Indirizzo del deposito di transito transfrontaliero",
+      addressFirst: "Si prega di inviare il pacco a questo indirizzo prima",
+      pleaseCompany: "Inserisci il nome della compagnia di corriere",
+      useDelivery: "utilizzare la consegna espressa",
+      //团长入驻
+      teamSettle: "Il capo squadra si è sistemato",
+      pleaseName: "Inserisci il tuo vero nome",
+      IDCard: "Numero identificativo",
+      enterCard: "Inserisci la tua carta d'identità",
+      backCard: "Numero della carta di credito",
+      pleaseBackCard: "Inserisci il numero della tua carta di credito",
+      pleasePhone: "Inserisci il tuo numero di telefono",
+      QRCode: "Codice di verifica",
+      pleaseQrCode: "Inserisci il codice di verifica SMS",
+      getQrCode: "Ottenere il codice di verifica",
+      startVerification: "Avvia la verifica del riconoscimento facciale",
+      userServiceAgreement: "Accordo di servizio utente",
+      checkFirst: "Seleziona prima la casella",
+      applicationResult:
+        "Applicazione riuscita, si prega di attendere il risultato della recensione",
+      pleaseIdentity: "Si prega di completare prima la verifica dell'identità",
     },
   },
 };

pageC/applicationRefund/applicationRefund.vue

@@ -77,7 +77,7 @@
           @delete="deletePic"
           name="6"
           multiple
-          :maxCount="10"
+          :maxCount="9"
         >
           <view class="unload">
             <view class="text-content"> 上传凭证<br />(最多9张) </view>

pageD/orderDetail/orderDetail.vue

@@ -211,7 +211,15 @@ export default {
           this.orderDetail = res;
           //直接在dom中使用会报错，首先判断字段存不存在，重新复制后使用
           if (res.container) {
-            this.transportType = res.container.transport_type.name;
+            if (this.language == "zh-CN") {
+              this.transportType = res.container.transport_type.name_cn;
+            } else if (this.language == "en-US") {
+              this.transportType = res.container.transport_type.name_en;
+            } else if (this.language == "es-ES") {
+              this.transportType = res.container.transport_type.name_es;
+            } else {
+              this.transportType = res.container.transport_type.name_ita;
+            }
           }
           this.title = this.i18n.depositPaid;
         });
@@ -225,7 +233,15 @@ export default {
           this.orderDetail = res;
           //直接在dom中使用会报错，首先判断字段存不存在，重新复制后使用
           if (res.container) {
-            this.transportType = res.container.transport_type.name;
+            if (this.language == "zh-CN") {
+              this.transportType = res.container.transport_type.name_cn;
+            } else if (this.language == "en-US") {
+              this.transportType = res.container.transport_type.name_en;
+            } else if (this.language == "es-ES") {
+              this.transportType = res.container.transport_type.name_es;
+            } else {
+              this.transportType = res.container.transport_type.name_ita;
+            }
           }
           this.title = res.status_name;
         });

pageD/resultFeedback/resultFeedback.vue

@@ -2,47 +2,46 @@
   <view class="page">
     <view class="content" v-if="information.status == 0">
       <image class="logo" src="../../static/mine/350.png" mode=""></image>
-      <view class="wait">审核中</view>
-      <view class="review">审核中，请耐心等待~</view>
+      <view class="wait">{{ i18n.inReview }}</view>
+      <view class="review">{{ i18n.WaitingReview }}</view>
     </view>
     <view class="content" v-else-if="information.status == 2">
       <image class="logo" src="../../static/mine/351.png" mode=""></image>
-      <view class="wait">审核失败</view>
-      <view class="review">未通过，请重新提交信息</view>
-      <view class="refuse">拒绝原因：{{ information.refusal }}</view>
+      <view class="wait">{{ i18n.auditFailed }}</view>
+      <view class="review">{{ i18n.failedReview }}</view>
+      <view class="refuse">{{
+        i18n.rejectReason + "：" + information.refusal
+      }}</view>
     </view>
     <view class="content" v-else>
       <image class="logo" src="../../static/mine/352.png" mode=""></image>
-      <view class="wait">您已入驻成功</view>
-      <view class="prompt"
-        >请访问以下pc端地址进行店铺信息维护以及 商品信息的发布</view
-      >
+      <view class="prompt">{{ i18n.goodsRelease }}</view>
       <view class="inp">
         <view class="url">https://cbec-admin.hdlkeji.com/#/login</view>
         <view
           style="color: #f83224; font-size: 26rpx"
           @click="cope('https://cbec-admin.hdlkeji.com/#/login')"
         >
-          复制链接
+          {{ i18n.copyLink }}
         </view>
       </view>
       <view class="account">
-        <view class="_label">账号：</view>
+        <view class="_label">{{ i18n.accountNumber }}：</view>
         <view class="_value">{{ information.username }}</view>
       </view>
       <view class="account">
-        <view class="_label">密码：</view>
+        <view class="_label">{{ i18n.accountPassword }} ：</view>
         <view class="_value">{{ information.password }}</view>
       </view>
     </view>
     <button class="go-back" @click="back" v-if="information.status == 0">
-      返回首页
+      {{ i18n.Backtohomepage }}
     </button>
     <button class="go-back" @click="back" v-if="information.status == 1">
-      返回
+      {{ i18n.return }}
     </button>
     <button class="go-back" @click="resetSubmit" v-if="information.status == 2">
-      重新提交
+      {{ i18n.resubmit }}
     </button>
   </view>
 </template>
@@ -55,13 +54,18 @@ export default {
       information: {},
     };
   },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
   methods: {
     cope(e) {
       uni.setClipboardData({
         data: e,
         success() {
           uni.showToast({
-            title: "复制成功",
+            title: this.i18n.replicatingSuccess,
             icon: "none",
           });
         },
@@ -89,7 +93,7 @@ export default {
   created() {
     this.getInfo();
     uni.setNavigationBarTitle({
-      title: "结果反馈",
+      title: this.i18n.resultFeedback,
     });
   },
 };

pageD/sending/sending.vue

@@ -2,10 +2,10 @@
   <view class="page" @click="closeName">
     <view class="address">
       <view class="address-top">
-        <text space="emsp" class="top_left_text"
-          >跨境中转仓库地址 {{ "&emsp;" }}</text
+        <text space="emsp" class="top_left_text">
+          {{ i18n.warehouseAddress + "&emsp;" }}</text
         >
-        <text class="top_right_text">请先将包裹寄往这个地址～</text>
+        <text class="top_right_text">{{ i18n.addressFirst }}</text>
       </view>
       <view class="address-content">
         <image
@@ -27,18 +27,18 @@
 
     <view class="express">
       <view class="_input-1 _input-2">
-        <view class="_label">快递单号</view>
+        <view class="_label">{{ i18n.TrackingNumber }}</view>
         <u--input
-          placeholder="请输入快递单号"
+          :placeholder="i18n.trackingNumber"
           border="none"
           v-model="expressNum"
           clearable
         ></u--input>
       </view>
       <view class="_input-1" @click.stop="openName">
-        <view class="_label">快递公司</view>
+        <view class="_label">{{ i18n.Expresscompany }}</view>
         <u--input
-          placeholder="请输入快递公司名称"
+          :placeholder="i18n.pleaseCompany"
           border="none"
           @change="searchExpress"
           v-model="expressName"
@@ -53,7 +53,7 @@
       />
     </view>
     <view class="footer">
-      <button class="btn-2" @click="submit">保存</button>
+      <button class="btn-2" @click="submit">{{ i18n.preserve }}</button>
     </view>
   </view>
 </template>
@@ -77,6 +77,11 @@ export default {
   onLoad(options) {
     this.orderId = options.orderId;
   },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
   methods: {
     //过滤搜索结果
     searchExpress(e) {
@@ -113,7 +118,7 @@ export default {
             delta: 1,
           });
           uni.showToast({
-            title: "已保存",
+            title: this.i18n.saved,
             icon: "none",
           });
         });
@@ -131,7 +136,7 @@ export default {
   mounted() {
     this.getExpressNameList();
     uni.setNavigationBarTitle({
-      title: "寄快递",
+      title: this.i18n.useDelivery,
     });
   },
 };

pageD/settleIn/settleIn.vue

@@ -7,16 +7,21 @@
         ref="uForm"
         labelWidth="100"
       >
-        <u-form-item label="姓名" prop="userInfo.name" borderBottom ref="item1">
+        <u-form-item
+          :label="i18n.name"
+          prop="userInfo.name"
+          borderBottom
+          ref="item1"
+        >
           <u--input
             inputAlign="right"
             v-model="model1.name"
-            placeholder="请输入真实姓名"
+            :placeholder="i18n.pleaseName"
             border="none"
           ></u--input>
         </u-form-item>
         <u-form-item
-          label="身份证号"
+          :label="i18n.IDCard"
           prop="userInfo.name"
           borderBottom
           ref="item1"
@@ -25,12 +30,12 @@
             inputAlign="right"
             v-model="model1.idcard"
             type="idcard"
-            placeholder="请输入您的身份证"
+            :placeholder="i18n.enterCard"
             border="none"
           ></u--input>
         </u-form-item>
         <u-form-item
-          label="银行卡号"
+          :label="i18n.backCard"
           prop="userInfo.name"
           borderBottom
           ref="item1"
@@ -39,12 +44,12 @@
             inputAlign="right"
             v-model="model1.card_number"
             type="number"
-            placeholder="请输入您的银行卡号"
+            :placeholder="i18n.pleaseBackCard"
             border="none"
           ></u--input>
         </u-form-item>
         <u-form-item
-          label="手机号"
+          :label="i18n.phone"
           prop="userInfo.name"
           borderBottom
           ref="item1"
@@ -53,20 +58,20 @@
             inputAlign="right"
             v-model="model1.phone"
             type="number"
-            placeholder="请输入手机号"
+            :placeholder="i18n.pleasePhone"
             border="none"
           ></u--input>
         </u-form-item>
-        <u-form-item label="验证码" borderBottom ref="item1">
+        <u-form-item :label="i18n.QRCode" borderBottom ref="item1">
           <view style="display: flex; align-items: center">
             <u--input
               inputAlign="right"
               v-model="model1.code"
-              placeholder="请输入短信验证码"
+              :placeholder="i18n.pleaseQrCode"
               border="none"
             ></u--input>
             <view style="color: #f83224; font-weight: 600; margin-left: 50rpx">
-              获取验证码
+              {{ i18n.getQrCode }}
             </view>
           </view>
         </u-form-item>
@@ -82,12 +87,15 @@
           @change="radioChange"
         ></u-checkbox>
       </u-checkbox-group>
-      我已阅读并同意<text style="color: #f83224" @click="toUserAgreement"
-        >《用户服务协议》</text
-      >和
-      <text style="color: #f83224" @click="toPrivacy">《隐私政策》</text>
+      {{ i18n.readandAgree
+      }}<text style="color: #f83224" @click="toUserAgreement"
+        >《{{ i18n.userServiceAgreement }}》</text
+      >{{ i18n.and }}
+      <text style="color: #f83224" @click="toPrivacy"
+        >《{{ i18n.privacy }}》</text
+      >
     </view>
-    <button class="btn" @click="submit">开始人脸识别验证</button>
+    <button class="btn" @click="submit">{{ i18n.startVerification }}</button>
   </view>
 </template>
 
@@ -107,6 +115,11 @@ export default {
       radiovalue1: false,
     };
   },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
   methods: {
     radioChange() {
       console.log(this.radiovalue1);
@@ -117,7 +130,7 @@ export default {
       console.log(this.radiovalue1);
       if (!this.radiovalue1) {
         uni.showToast({
-          title: "请先勾选《用户服务协议》和《隐私政策》",
+          title: `${this.i18n.checkFirst}《${this.i18n.userServiceAgreement}》${this.i18n.and}《${this.i18n.privacy}》`,
           icon: "none",
         });
         return;
@@ -125,25 +138,25 @@ export default {
       delete this.model1.code;
       if (!this.model1.name) {
         uni.showToast({
-          title: "请填写姓名",
+          title: this.i18n.pleaseName,
           icon: "none",
         });
         return;
       } else if (!this.model1.idcard) {
         uni.showToast({
-          title: "请填写身份证号",
+          title: this.i18n.enterCard,
           icon: "none",
         });
         return;
       } else if (!this.model1.phone) {
         uni.showToast({
-          title: "请填写手机号",
+          title: this.i18n.pleasePhone,
           icon: "none",
         });
         return;
       } else if (!this.model1.card_number) {
         uni.showToast({
-          title: "请填写银行卡号",
+          title: this.i18n.pleaseBackCard,
           icon: "none",
         });
         return;
@@ -157,15 +170,12 @@ export default {
           },
           verifyDoneCallback(res) {
             const { token, verifyDone } = res;
-            console.log("收到核身完成的res:", res);
-            console.log("核身的token是:", token);
-            console.log("是否完成核身:", verifyDone);
             if (verifyDone) {
               uni.$u.http
                 .post("/api/merchant/apply", this.model1)
                 .then((res) => {
                   uni.showToast({
-                    title: "申请成功，请等待审核结果",
+                    title: this.i18n.applicationResult,
                   });
                   uni.navigateTo({
                     url: "/pages/mine/mine",
@@ -173,7 +183,7 @@ export default {
                 });
             } else {
               uni.showToast({
-                title: "请先完成身份核验",
+                title: this.i18n.pleaseIdentity,
               });
             }
           },
@@ -195,7 +205,7 @@ export default {
   mounted() {
     this.getTeamStatus();
     uni.setNavigationBarTitle({
-      title: "团长入驻",
+      title: this.i18n.teamSettle,
     });
   },
 };

pageD/supplyChainGoods/supplyChainGoods.vue

@@ -2,7 +2,7 @@
   <view>
     <view class="top-tab-search">
       <u--input
-        placeholder="搜索商品名称"
+        :placeholder="i18n.searchGoods"
         shape="circle"
         prefixIcon="search"
         prefixIconStyle="font-size: 22px;color: #909399"
@@ -16,35 +16,35 @@
             class="tab"
             @click="tabSwitch('null')"
           >
-            全部
+            {{ i18n.whole }}
           </view>
           <view
             :class="{ commodity: follow == 'normal' }"
             class="tab"
             @click="tabSwitch('normal')"
           >
-            已上架
+            {{ i18n.alreadyListed }}
           </view>
           <view
             :class="{ commodity: follow == 7 }"
             class="tab"
             @click="tabSwitch(7)"
           >
-            审核中
+            {{ i18n.inReview }}
           </view>
           <view
             :class="{ commodity: follow == 2 }"
             class="tab"
             @click="tabSwitch(2)"
           >
-            审核失败
+            {{ i18n.auditFailed }}
           </view>
           <view
             :class="{ commodity: follow == 'down' }"
             class="tab"
             @click="tabSwitch('down')"
           >
-            已下架
+            {{ i18n.removed }}
           </view>
         </view>
       </view>
@@ -58,6 +58,7 @@
           @toDetail="toDetail"
           :itemInfo="item"
           @goodsUpDown="goodsUpDown"
+          :language="language"
         />
       </view>
     </view>
@@ -82,6 +83,7 @@ export default {
       reviewStatus: "",
       productStatus: "",
       searchValue: "",
+      language: this._language, //用户当前选择的语言
     };
   },
   computed: {
@@ -145,7 +147,10 @@ export default {
         .then((res) => {
           this.getinfoList();
           uni.showToast({
-            title: value == "down" ? "下架成功" : "上架成功",
+            title:
+              value == "down"
+                ? this.i18n.removedSuccessfully
+                : this.i18n.successfullyListed,
             icon: "none",
           });
         });
@@ -154,7 +159,7 @@ export default {
   mounted() {
     this.getinfoList();
     uni.setNavigationBarTitle({
-      title: "我的供应链商品",
+      title: this.i18n.supplyChain,
     });
   },
 };

unpackage/dist/dev/mp-weixin/pageB/Senderinfor.wxml

@@ -1 +1 @@
-<view class="back"><view class="info"><view class="item u-flex u-row-between"><text class="title">{{i18n.senderinfo}}</text><view class="u-flex"><u-icon vue-id="a383861e-1" name="order" color="rgba(0, 0, 0, 0.6)" size="23" bind:__l="__l"></u-icon><text class="wx">{{i18n.wxAddress}}</text></view></view><view class="item u-flex "><text class="left">{{i18n.name}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex "><text class="left">{{i18n.phone}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex "><text class="left">{{i18n.city}}</text><view class="right"><input type="text" placeholder="{{i18n.selection}}" disabled/></view></view><view class="item u-flex "><text class="left">{{i18n.detailed}}</text><view class="right"><input type="area" placeholder="{{i18n.Fill}}" disabled/></view></view><view class="item u-flex "><input type="area" placeholder="{{i18n.company}}"/></view><view class="u-flex u-row-between" style="margin-top:22rpx;"><view class="u-flex"><view><u-checkbox-group vue-id="a383861e-2" placement="row" value="{{checkboxValue1}}" data-event-opts="{{[['^change',[['checkboxChange']]],['^input',[['__set_model',['','checkboxValue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" bind:__l="__l" vue-slots="{{['default']}}"><u-checkbox vue-id="{{('a383861e-3')+','+('a383861e-2')}}" shape="circle" customStyle="{{({marginRight:'4px'})}}" name="{{name}}" bind:__l="__l"></u-checkbox></u-checkbox-group></view><text class="clear">{{i18n.initial}}</text></view><text class="clear">{{''+i18n.empty+''}}</text></view></view><view class="history">{{i18n.history}}</view><view class="add"><view><text class="name">陈盼盼</text><text class="phone">176****3298</text></view><view class="addinfo">江苏省南京市浦口区浦口大道东方万汇城北区</view></view><view class="bottom"><view class="btn">{{''+i18n.enter+''}}</view></view></view>
+<view class="back"><view class="info"><view class="item u-flex u-row-between"><text class="title">{{i18n.senderinfo}}</text><view class="u-flex"><u-icon vue-id="a383861e-1" name="order" color="rgba(0, 0, 0, 0.6)" size="23" bind:__l="__l"></u-icon><text class="wx">{{i18n.wxAddress}}</text></view></view><view class="item u-flex"><text class="left">{{i18n.name}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex"><text class="left">{{i18n.phone}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex"><text class="left">{{i18n.city}}</text><view class="right"><input type="text" placeholder="{{i18n.selection}}" disabled/></view></view><view class="item u-flex"><text class="left">{{i18n.detailed}}</text><view class="right"><input type="area" placeholder="{{i18n.Fill}}" disabled/></view></view><view class="item u-flex"><input type="area" placeholder="{{i18n.company}}"/></view><view class="u-flex u-row-between" style="margin-top:22rpx;"><view class="u-flex"><view><u-checkbox-group vue-id="a383861e-2" placement="row" value="{{checkboxValue1}}" data-event-opts="{{[['^change',[['checkboxChange']]],['^input',[['__set_model',['','checkboxValue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" bind:__l="__l" vue-slots="{{['default']}}"><u-checkbox vue-id="{{('a383861e-3')+','+('a383861e-2')}}" shape="circle" customStyle="{{({marginRight:'4px'})}}" name="{{name}}" bind:__l="__l"></u-checkbox></u-checkbox-group></view><text class="clear">{{i18n.initial}}</text></view><text class="clear">{{''+i18n.empty+''}}</text></view></view><view class="history">{{i18n.history}}</view><view class="add"><view><text class="name">陈盼盼</text><text class="phone">176****3298</text></view><view class="addinfo">江苏省南京市浦口区浦口大道东方万汇城北区</view></view><view class="bottom"><view class="btn">{{''+i18n.enter+''}}</view></view></view>

unpackage/dist/dev/mp-weixin/pageB/search.wxml

@@ -1 +1 @@
-<view class="back data-v-4bad5c32"><view class="u-flex u-row-between data-v-4bad5c32"><view style="width:622rpx;" class="data-v-4bad5c32"><u-search vue-id="29feab14-1" placeholder="{{i18n.Please}}" showAction="{{false}}" value="{{keyword}}" data-event-opts="{{[['^focus',[['focus']]],['^input',[['__set_model',['','keyword','$event',[]]]]]]}}" bind:focus="__e" bind:input="__e" class="data-v-4bad5c32" bind:__l="__l"></u-search></view><block wx:if="{{keyword==''}}"><text data-event-opts="{{[['tap',[['clear',['$event']]]]]}}" bindtap="__e" class="data-v-4bad5c32">{{i18n.Cancel}}</text></block><block wx:else><text data-event-opts="{{[['tap',[['enter',['$event']]]]]}}" bindtap="__e" class="data-v-4bad5c32">{{i18n.enter}}</text></block></view><block wx:if="{{blurshow==false&&keyword==''}}"><view class="title data-v-4bad5c32" style="margin-top:32rpx;">{{''+i18n.Popularshipment+''}}</view></block><block wx:if="{{blurshow==false&&keyword==''}}"><view class="u-flex  data-v-4bad5c32" style="column-gap:20rpx;flex-wrap:wrap;"><block wx:for="{{record}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view data-event-opts="{{[['tap',[['select',['$0'],[[['record','',idx]]]]]]]}}" class="tabs data-v-4bad5c32" bindtap="__e">{{''+item+''}}</view></block></view></block><block wx:if="{{blurshow}}"><scroll-view scroll-y="{{true}}" class="data-v-4bad5c32"><block wx:for="{{goods}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['changeitem',['$0'],[[['goods','',index]]]]]]]}}" class="searchitem data-v-4bad5c32" bindtap="__e"><block wx:if="{{language=='zh-CN'}}"><text class="data-v-4bad5c32">{{item.name_cn}}</text></block><block wx:if="{{language=='en-US'}}"><text class="data-v-4bad5c32">{{item.name_en}}</text></block><block wx:if="{{language=='es-ES'}}"><text class="data-v-4bad5c32">{{item.name_es}}</text></block><block wx:if="{{language=='it-IT'}}"><text class="data-v-4bad5c32">{{item.name_ita}}</text></block></view></block></scroll-view></block></view>
+<view class="back data-v-4bad5c32"><view class="u-flex u-row-between data-v-4bad5c32"><view style="width:622rpx;" class="data-v-4bad5c32"><u-search vue-id="29feab14-1" placeholder="{{i18n.Please}}" showAction="{{false}}" value="{{keyword}}" data-event-opts="{{[['^focus',[['focus']]],['^input',[['__set_model',['','keyword','$event',[]]]]]]}}" bind:focus="__e" bind:input="__e" class="data-v-4bad5c32" bind:__l="__l"></u-search></view><block wx:if="{{keyword==''}}"><text data-event-opts="{{[['tap',[['clear',['$event']]]]]}}" bindtap="__e" class="data-v-4bad5c32">{{i18n.Cancel}}</text></block><block wx:else><text data-event-opts="{{[['tap',[['enter',['$event']]]]]}}" bindtap="__e" class="data-v-4bad5c32">{{i18n.enter}}</text></block></view><block wx:if="{{blurshow==false&&keyword==''}}"><view class="title data-v-4bad5c32" style="margin-top:32rpx;">{{''+i18n.Popularshipment+''}}</view></block><block wx:if="{{blurshow==false&&keyword==''}}"><view class="u-flex data-v-4bad5c32" style="column-gap:20rpx;flex-wrap:wrap;"><block wx:for="{{record}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view data-event-opts="{{[['tap',[['select',['$0'],[[['record','',idx]]]]]]]}}" class="tabs data-v-4bad5c32" bindtap="__e">{{''+item+''}}</view></block></view></block><block wx:if="{{blurshow}}"><scroll-view scroll-y="{{true}}" class="data-v-4bad5c32"><block wx:for="{{goods}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['changeitem',['$0'],[[['goods','',index]]]]]]]}}" class="searchitem data-v-4bad5c32" bindtap="__e"><block wx:if="{{language=='zh-CN'}}"><text class="data-v-4bad5c32">{{item.name_cn}}</text></block><block wx:if="{{language=='en-US'}}"><text class="data-v-4bad5c32">{{item.name_en}}</text></block><block wx:if="{{language=='es-ES'}}"><text class="data-v-4bad5c32">{{item.name_es}}</text></block><block wx:if="{{language=='it-IT'}}"><text class="data-v-4bad5c32">{{item.name_ita}}</text></block></view></block></scroll-view></block></view>

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

@@ -1 +1 @@
-<view class="data-v-3535e917"><view class="top-tab-search data-v-3535e917"><u--input vue-id="7187bacf-1" placeholder="搜索商品名称" shape="circle" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" value="{{searchValue}}" data-event-opts="{{[['^change',[['search']]],['^input',[['__set_model',['','searchValue','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-3535e917" bind:__l="__l"></u--input><view class="tab data-v-3535e917"><view class="top-tab data-v-3535e917"><view data-event-opts="{{[['tap',[['tabSwitch',['null']]]]]}}" class="{{['tab','data-v-3535e917',(follow=='null')?'commodity':'']}}" bindtap="__e">全部</view><view data-event-opts="{{[['tap',[['tabSwitch',['normal']]]]]}}" class="{{['tab','data-v-3535e917',(follow=='normal')?'commodity':'']}}" bindtap="__e">已上架</view><view data-event-opts="{{[['tap',[['tabSwitch',[7]]]]]}}" class="{{['tab','data-v-3535e917',(follow==7)?'commodity':'']}}" bindtap="__e">审核中</view><view data-event-opts="{{[['tap',[['tabSwitch',[2]]]]]}}" class="{{['tab','data-v-3535e917',(follow==2)?'commodity':'']}}" bindtap="__e">审核失败</view><view data-event-opts="{{[['tap',[['tabSwitch',['down']]]]]}}" class="{{['tab','data-v-3535e917',(follow=='down')?'commodity':'']}}" bindtap="__e">已下架</view></view></view></view><view class="page data-v-3535e917"><block wx:for="{{goodsList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view class="data-v-3535e917"><goods-information vue-id="{{'7187bacf-2-'+__i0__}}" productAndCommodity="product" status="{{status}}" itemInfo="{{item}}" data-event-opts="{{[['^toDetail',[['toDetail']]],['^goodsUpDown',[['goodsUpDown']]]]}}" bind:toDetail="__e" bind:goodsUpDown="__e" class="data-v-3535e917" bind:__l="__l"></goods-information></view></block></view></view>
+<view class="data-v-3535e917"><view class="top-tab-search data-v-3535e917"><u--input vue-id="7187bacf-1" placeholder="{{i18n.searchGoods}}" shape="circle" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" value="{{searchValue}}" data-event-opts="{{[['^change',[['search']]],['^input',[['__set_model',['','searchValue','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-3535e917" bind:__l="__l"></u--input><view class="tab data-v-3535e917"><view class="top-tab data-v-3535e917"><view data-event-opts="{{[['tap',[['tabSwitch',['null']]]]]}}" class="{{['tab','data-v-3535e917',(follow=='null')?'commodity':'']}}" bindtap="__e">{{''+i18n.whole+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['normal']]]]]}}" class="{{['tab','data-v-3535e917',(follow=='normal')?'commodity':'']}}" bindtap="__e">{{''+i18n.alreadyListed+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',[7]]]]]}}" class="{{['tab','data-v-3535e917',(follow==7)?'commodity':'']}}" bindtap="__e">{{''+i18n.inReview+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',[2]]]]]}}" class="{{['tab','data-v-3535e917',(follow==2)?'commodity':'']}}" bindtap="__e">{{''+i18n.auditFailed+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['down']]]]]}}" class="{{['tab','data-v-3535e917',(follow=='down')?'commodity':'']}}" bindtap="__e">{{''+i18n.removed+''}}</view></view></view></view><view class="page data-v-3535e917"><block wx:for="{{goodsList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view class="data-v-3535e917"><goods-information vue-id="{{'7187bacf-2-'+__i0__}}" productAndCommodity="product" status="{{status}}" itemInfo="{{item}}" language="{{language}}" data-event-opts="{{[['^toDetail',[['toDetail']]],['^goodsUpDown',[['goodsUpDown']]]]}}" bind:toDetail="__e" bind:goodsUpDown="__e" class="data-v-3535e917" bind:__l="__l"></goods-information></view></block></view></view>

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

@@ -32,5 +32,12 @@
       "current": -1,
       "list": []
     }
+<<<<<<< HEAD
+=======
+  },
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+>>>>>>> cc56eed1b8e415a64c367ab2de22b66125397714
   }
 }

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

@@ -1,118 +1,16 @@
 {
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-<<<<<<< HEAD
-  "condition": {}
-=======
   "condition": {
     "miniprogram": {
       "list": [
         {
-          "name": "pageD/afterSalesDetail/afterSalesDetail",
-          "pathName": "pageD/afterSalesDetail/afterSalesDetail",
-          "query": "id=131",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pageD/afterSalesManage/afterSalesManage",
-          "pathName": "pageD/afterSalesManage/afterSalesManage",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pageD/orderDetail/orderDetail",
-          "pathName": "pageD/orderDetail/orderDetail",
-          "query": "orderStatus=526&status=closed",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pageD/orderFormManage/orderFormManage",
-          "pathName": "pageD/orderFormManage/orderFormManage",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pageD/logisticsProgress/logisticsProgress",
-          "pathName": "pageD/logisticsProgress/logisticsProgress",
-          "query": "source_type=order&source_id=467",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "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",
+          "name": "pageD/supplyChainGoods/supplyChainGoods",
+          "pathName": "pageD/supplyChainGoods/supplyChainGoods",
           "query": "",
           "launchMode": "default",
           "scene": null
-        },
-        {
-          "name": "pageC/withdrawal/withdrawal",
-          "pathName": "pageC/withdrawal/withdrawal",
-          "query": "type=balance",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pageC/myPackage/myPackage",
-          "pathName": "pageC/myPackage/myPackage",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pageA/confirm",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pageD/newBulitOrder/newBulitOrder",
-          "query": "orderId=509",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pageD/orderInformation/orderInformation",
-          "query": "orderStatus=491",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pageC/orderForm/orderForm",
-          "query": "followId=",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pageC/orderFormDetail/orderFormDetail",
-          "query": "orderId=533",
-          "launchMode": "default",
-          "scene": null
         }
       ]
     }
   }
->>>>>>> 1de82ccf73c303f20d993e4c3a9041061a0dcd85
 }

unpackage/dist/dev/mp-weixin/uni_modules/lime-painter/components/l-painter-image/l-painter-image.json

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

unpackage/dist/dev/mp-weixin/uni_modules/lime-painter/components/l-painter/l-painter.json

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

unpackage/dist/dev/mp-weixin/uview-ui/components/u-swipe-action-item/u-swipe-action-item.json

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