mabaoyi 7 månader sedan
förälder
incheckning
24050e0e20
57 ändrade filer med 299 tillägg och 129 borttagningar
  1. 134 0
      commont/messages.js
  2. 1 0
      main.js
  3. 11 7
      pageC/balanceDetail/balanceDetail.vue
  4. 31 2
      pageC/ensureExplain/ensureExplain.vue
  5. 1 1
      pageC/ensureMoney/ensureMoney.vue
  6. 14 6
      pageC/mineFollow/mineFollow.vue
  7. 16 9
      pageC/myPackage/component/packageCard.vue
  8. 2 0
      pageC/myPackage/myPackage.vue
  9. 47 40
      pageD/orderInformation/orderInformation.vue
  10. 1 1
      pages.json
  11. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  12. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  13. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/balanceDetail/balanceDetail.js.map
  14. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/ensureExplain/ensureExplain.js.map
  15. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/ensureMoney/ensureMoney.js.map
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/mineFollow/mineFollow.js.map
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/myPackage/component/packageCard.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/myPackage/myPackage.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageD/orderInformation/orderInformation.js.map
  20. 0 0
      unpackage/dist/dev/mp-weixin/common/main.js
  21. 0 0
      unpackage/dist/dev/mp-weixin/common/vendor.js
  22. 0 0
      unpackage/dist/dev/mp-weixin/pageA/chat/chat.wxml
  23. 0 0
      unpackage/dist/dev/mp-weixin/pageA/chat/news.wxml
  24. 0 0
      unpackage/dist/dev/mp-weixin/pageA/counter.wxml
  25. 0 0
      unpackage/dist/dev/mp-weixin/pageA/service/service.wxml
  26. 0 0
      unpackage/dist/dev/mp-weixin/pageA/shoplist.wxml
  27. 0 0
      unpackage/dist/dev/mp-weixin/pageA/subsidy.wxml
  28. 1 1
      unpackage/dist/dev/mp-weixin/pageB/Senderinfor.wxml
  29. 0 0
      unpackage/dist/dev/mp-weixin/pageB/account.wxml
  30. 0 0
      unpackage/dist/dev/mp-weixin/pageB/myPackage.wxml
  31. 0 0
      unpackage/dist/dev/mp-weixin/pageB/recipientinfo.wxml
  32. 1 1
      unpackage/dist/dev/mp-weixin/pageB/search.wxml
  33. 0 0
      unpackage/dist/dev/mp-weixin/pageC/balanceDetail/balanceDetail.js
  34. 1 1
      unpackage/dist/dev/mp-weixin/pageC/balanceDetail/balanceDetail.wxml
  35. 0 0
      unpackage/dist/dev/mp-weixin/pageC/ensureExplain/ensureExplain.js
  36. 1 1
      unpackage/dist/dev/mp-weixin/pageC/ensureExplain/ensureExplain.json
  37. 1 1
      unpackage/dist/dev/mp-weixin/pageC/ensureExplain/ensureExplain.wxml
  38. 1 1
      unpackage/dist/dev/mp-weixin/pageC/ensureMoney/ensureMoney.wxml
  39. 0 0
      unpackage/dist/dev/mp-weixin/pageC/mineFollow/mineFollow.js
  40. 0 0
      unpackage/dist/dev/mp-weixin/pageC/mineFollow/mineFollow.wxml
  41. 0 1
      unpackage/dist/dev/mp-weixin/pageC/mineFollow/mineFollow.wxss
  42. 0 0
      unpackage/dist/dev/mp-weixin/pageC/myPackage/component/packageCard.js
  43. 0 0
      unpackage/dist/dev/mp-weixin/pageC/myPackage/component/packageCard.wxml
  44. 0 0
      unpackage/dist/dev/mp-weixin/pageC/myPackage/myPackage.js
  45. 1 1
      unpackage/dist/dev/mp-weixin/pageC/myPackage/myPackage.wxml
  46. 0 0
      unpackage/dist/dev/mp-weixin/pageD/orderInformation/orderInformation.js
  47. 0 0
      unpackage/dist/dev/mp-weixin/pageD/orderInformation/orderInformation.wxml
  48. 0 0
      unpackage/dist/dev/mp-weixin/pages/index/index.wxml
  49. 2 2
      unpackage/dist/dev/mp-weixin/pages/mine/component/mallOrderForm.json
  50. 2 2
      unpackage/dist/dev/mp-weixin/pages/mine/component/mineMoney.json
  51. 2 2
      unpackage/dist/dev/mp-weixin/pages/mine/component/personalFunction.json
  52. 2 2
      unpackage/dist/dev/mp-weixin/pages/mine/component/teamFunction.json
  53. 18 1
      unpackage/dist/dev/mp-weixin/project.config.json
  54. 2 40
      unpackage/dist/dev/mp-weixin/project.private.config.json
  55. 2 2
      unpackage/dist/dev/mp-weixin/uni_modules/lime-painter/components/l-painter-image/l-painter-image.json
  56. 2 2
      unpackage/dist/dev/mp-weixin/uni_modules/lime-painter/components/l-painter-text/l-painter-text.json
  57. 2 2
      unpackage/dist/dev/mp-weixin/uni_modules/lime-painter/components/l-painter/l-painter.json

+ 134 - 0
commont/messages.js

@@ -359,6 +359,38 @@ export default {
       saldo: "保证金余额",
       depositDetails: "保证金明细",
       noMore: "没有更多数据了",
+      //保证金明细
+      income: "收入",
+      expenditure: "支出",
+      marginStatement: "保证金说明",
+      //我的包裹
+      toPiattaforma: "商品已寄往平台,正在运输中",
+      peso: "商品已打包称重,等待用户付款",
+      waitPiattaforma: "等待平台发货",
+      prodottoInviato: "商品已发出,很快将发货至您的手中",
+      insiemeDetail: "拼包详情",
+      orderCompleto: "订单签收,交易已完成",
+      pesoEmissione: "等待中转称重发出",
+      orderClose: "订单关闭",
+      orderRefund: "订单已退款",
+      refunding: "订单正在申请退款",
+      waitCommity: "商品等待发货中",
+      origin: "始发地",
+      weighingWeight: "称重重量",
+      weighingImage: "称重图片",
+      paymentRequired: "需付款",
+      send: "寄",
+      putAway: "收",
+      goodsNum: "件数",
+      cope: "复制",
+      payTime: "付款时间",
+      sendTime: "发货时间",
+      signForTime: "签收时间",
+      pengingPay: "待付",
+      paid: "已付",
+      checkLogistics: "查看物流",
+      logisticsInformation: "填写物流信息",
+      saved: "已保存",
     },
   },
   //英语
@@ -720,6 +752,40 @@ export default {
       saldo: "margin balance",
       depositDetails: "Deposit details",
       noMore: "There is no more data available",
+      //保证金明细
+      income: "income",
+      expenditure: "expenditure",
+      marginStatement: "Margin Statement",
+      //我的包裹
+      toPiattaforma:
+        "The product has been sent to the platform and is currently in transit",
+      peso: "The product has been packaged and weighed, waiting for user payment",
+      waitPiattaforma: "Waiting for the platform to ship",
+      prodottoInviato:
+        "The product has been shipped and will be delivered to you soon",
+      insiemeDetail: "Package Details",
+      orderCompleto: "Order signed for, transaction completed",
+      pesoEmissione: "Waiting for transit weighing to be sent out",
+      orderClose: "Order closure",
+      orderRefund: "Order refunded",
+      refunding: "The order is applying for a refund",
+      waitCommity: "The product is waiting for shipment",
+      origin: "ORIGIN",
+      weighingWeight: "Weighing weight",
+      weighingImage: "Weighing image",
+      paymentRequired: "Payment required",
+      send: "send",
+      putAway: "put away",
+      goodsNum: "number",
+      cope: "copy",
+      payTime: "Payment Time",
+      sendTime: "delivery time",
+      signForTime: "Sign in time",
+      pengingPay: "Pending payment",
+      paid: "paid",
+      checkLogistics: "View logistics",
+      logisticsInformation: "Fill in logistics information",
+      saved: "saved",
     },
   },
   // 西班牙
@@ -1089,6 +1155,40 @@ export default {
       saldo: "Saldo del margen",
       depositDetails: "Detalles de la fianza",
       noMore: "No hay más datos",
+      //保证金明细
+      income: "Ingresos",
+      expenditure: "Gastos",
+      marginStatement: "Descripción de la fianza",
+      //我的包裹
+      toPiattaforma:
+        "Los productos han sido enviados a la Plataforma y están en transporte.",
+      peso: "Los productos han sido empaquetados y pesados, a la espera de que los usuarios paguen",
+      waitPiattaforma: "Esperando el envío de la plataforma",
+      prodottoInviato:
+        "Los productos han sido enviados y pronto se enviarán a usted.",
+      insiemeDetail: "Detalles del paquete",
+      orderCompleto: "Firma del pedido, la transacción se ha completado",
+      pesoEmissione: "A la espera de que se emita el pesaje de tránsito",
+      orderClose: "Cierre de pedidos",
+      orderRefund: "El pedido ha sido reembolsado",
+      refunding: "El pedido está solicitando un reembolso",
+      waitCommity: "Los productos están a la espera de ser enviados",
+      origin: "Lugar de origen",
+      weighingWeight: "Peso de pesaje",
+      weighingImage: "Imagen de pesaje",
+      paymentRequired: "Pago a pagar",
+      send: "Enviar",
+      putAway: "Recibir",
+      goodsNum: "Número de piezas",
+      cope: "Copiar",
+      payTime: "Tiempo de pago",
+      sendTime: "Tiempo de envío",
+      signForTime: "Tiempo de firma",
+      pengingPay: "Pendiente de pago",
+      paid: "Pagado",
+      checkLogistics: "Ver logística",
+      logisticsInformation: "Rellene la información logística",
+      saved: "Guardado",
     },
   },
   //意大利
@@ -1454,6 +1554,40 @@ export default {
       saldo: "saldo del margine",
       depositDetails: "Dettagli del deposito",
       noMore: "Non ci sono più dati disponibili",
+      //保证金明细
+      income: "reddito",
+      expenditure: "spese",
+      marginStatement: "Dichiarazione di margine",
+      //我的包裹
+      toPiattaforma:
+        "Il prodotto è stato inviato alla piattaforma ed è attualmente in transito",
+      peso: "Il prodotto è stato confezionato e pesato, in attesa del pagamento dell'utente",
+      waitPiattaforma: "In attesa della spedizione della piattaforma",
+      prodottoInviato:
+        "Il prodotto è stato spedito e ti verrà consegnato presto",
+      insiemeDetail: "Dettagli del pacchetto",
+      orderCompleto: "Ordine firmato, transazione completata",
+      pesoEmissione: "In attesa dell'invio della pesatura in transito",
+      orderClose: "Chiusura dell'ordine",
+      orderRefund: "Ordine rimborsato",
+      refunding: "L'ordine richiede un rimborso",
+      waitCommity: "Il prodotto è in attesa di spedizione",
+      origin: "Origine",
+      weighingWeight: "Peso di pesatura",
+      weighingImage: "Pesatura dell'immagine",
+      paymentRequired: "Pagamento richiesto",
+      send: "invia",
+      putAway: "raccogliere",
+      goodsNum: "numero",
+      cope: "copia",
+      payTime: "Tempi di pagamento",
+      sendTime: "Tempi di consegna",
+      signForTime: "Orario di accesso",
+      pengingPay: "Pagamento in sospeso",
+      paid: "pagato",
+      checkLogistics: "Visualizza la logistica",
+      logisticsInformation: "Compila le informazioni logistiche",
+      saved: "Salvato",
     },
   },
 };

+ 1 - 0
main.js

@@ -16,6 +16,7 @@ uni.getStorage({
   key: "language", // 这里替换成你要获取的数据的key
   success: function (res) {
     language = res.data; // 输出获取到的数据
+    Vue.prototype._language = language;
   },
   fail: function () {
     // 获取失败的处理逻辑

+ 11 - 7
pageC/balanceDetail/balanceDetail.vue

@@ -2,18 +2,18 @@
   <view class="detail">
     <!-- 顶部tab -->
     <view class="tab">
-      <text :class="{ selected: selected == '' }" @click="swcthTab('')"
-        >全部</text
-      >
+      <text :class="{ selected: selected == '' }" @click="swcthTab('')">{{
+        i18n.whole
+      }}</text>
       <text
         :class="{ selected: selected == 'income' }"
         @click="swcthTab('income')"
-        >收入</text
+        >{{ i18n.income }}</text
       >
       <text
         :class="{ selected: selected == 'consume' }"
         @click="swcthTab('consume')"
-        >支出</text
+        >{{ i18n.expenditure }}</text
       >
     </view>
     <!-- 顶部tab -->
@@ -46,7 +46,11 @@ export default {
       type: "",
     };
   },
-
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
   onReachBottom() {
     //商品总数量小于当前获取到的商品数量
     if (this.total > this.moneyDetail.length) {
@@ -62,7 +66,7 @@ export default {
       });
     } else {
       uni.setNavigationBarTitle({
-        title: "保证金明细",
+        title: this.i18n.depositDetails,
       });
     }
   },

+ 31 - 2
pageC/ensureExplain/ensureExplain.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="page">
-    <u-parse :content="agreementContent.content_cn"></u-parse>
+    <u-parse :content="agreementContent"></u-parse>
   </view>
 </template>
 
@@ -9,18 +9,47 @@ export default {
   data() {
     return {
       agreementContent: "",
+      language: "",
     };
   },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
   methods: {
     getAgreementContent() {
       uni.$u.http.get(`/api/agreement?code=margin_rule`).then((res) => {
-        console.log(res);
         this.agreementContent = res;
+        //判断选择的语言
+        if (this.language == "zh-CN") {
+          this.agreementContent = res.content_cn;
+        } else if (this.language == "en-US") {
+          this.agreementContent = res.content_en;
+        } else if (this.language == "es-ES") {
+          this.agreementContent = res.content_es;
+        } else {
+          this.agreementContent = res.content_ita;
+        }
       });
     },
   },
   mounted() {
+    //获取当前选择的语言
+    const _this = this;
+    uni.getStorage({
+      key: "language", // 这里替换成你要获取的数据的key
+      success: function (res) {
+        _this.language = res.data; // 输出获取到的数据
+      },
+      fail: function () {
+        // 获取失败的处理逻辑
+      },
+    });
     this.getAgreementContent();
+    uni.setNavigationBarTitle({
+      title: this.i18n.marginStatement,
+    });
   },
 };
 </script>

+ 1 - 1
pageC/ensureMoney/ensureMoney.vue

@@ -37,7 +37,7 @@
         />
       </view>
     </view>
-    <view class="bottom-text"> 没有更多数据了 </view>
+    <view class="bottom-text"> {{ i18n.noMore }} </view>
   </view>
 </template>
 

+ 14 - 6
pageC/mineFollow/mineFollow.vue

@@ -27,9 +27,18 @@
           mode=""
         ></image>
         <view class="commodity-right">
-          <view class="commodity-title">
+          <view class="commodity-title" v-if="language == 'zh-CN'">
             {{ item.merchant_goods.goods.name_cn }}
           </view>
+          <view class="commodity-title" v-if="language == 'en-US'">
+            {{ item.merchant_goods.goods.name_en }}
+          </view>
+          <view class="commodity-title" v-if="language == 'es-ES'">
+            {{ item.merchant_goods.goods.name_es }}
+          </view>
+          <view class="commodity-title" v-if="language == 'es-ES'">
+            {{ item.merchant_goods.goods.name_ita }}
+          </view>
           <view class="commodity-follow">
             <text v-show="item.interest_num <= 1000"
               >{{ item.interest_num }}
@@ -90,8 +99,9 @@ export default {
   data() {
     return {
       follow: 0,
-      commodityList: [],
-      teamList: [],
+      commodityList: [], //关注商品列表
+      teamList: [], //关注团长列表
+      language: this._language, //当前选择的语言
     };
   },
   computed: {
@@ -142,10 +152,8 @@ export default {
   .tab {
     display: flex;
     justify-content: space-between;
-    width: 240rpx;
-    // margin: 0 auto;
+    // width: 240rpx;
     font-size: 36rpx;
-    // margin-right: 60rpx;
 
     .commodity {
       position: relative;

+ 16 - 9
pageC/myPackage/component/packageCard.vue

@@ -3,13 +3,13 @@
     <view class="top-detail">
       <view class="top-left">
         <view class="_label-1" v-if="itemInfo.mall_order_id > 0">
-          平台自购
+          {{ i18n.purchase }}
         </view>
         <view class="_label-2" v-else-if="itemInfo.mall_order_id == 0">
-          自寄
+          {{ i18n.selfPost }}
         </view>
         <view class="order-num">
-          <text>订单编号:</text>
+          <text>{{ i18n.OrderNumber }}:</text>
           <text style="font-size: 24rpx">{{ itemInfo.order_no }}</text>
         </view>
       </view>
@@ -29,7 +29,7 @@
       </view>
     </view>
     <view class="price" v-if="itemInfo.status == 'unpaid'">
-      <text style="font-size: 24rpx; color: #333">合计</text>
+      <text style="font-size: 24rpx; color: #333">{{ i18n.total }}</text>
       <view style="color: #f83224; font-weight: 600">
         <text style="font-size: 20rpx">¥</text>
         <text>{{ itemInfo.gap_price.split(".")[0] }}</text
@@ -41,7 +41,7 @@
     </view>
     <view class="card-bottom">
       <view class="package-weight">
-        <text>包裹重量:</text>
+        <text>{{ i18n.Parcelweight }}:</text>
         <text>{{ Number(itemInfo.actual_weight) }}kg</text>
       </view>
       <view class="btn-list">
@@ -57,7 +57,7 @@
           "
           @click.stop="$emit('freeze', itemInfo)"
         >
-          {{ itemInfo.is_frozen == 0 ? "冻结" : "恢复" }}
+          {{ itemInfo.is_frozen == 0 ? i18n.Frozen : i18n.recover }}
         </button>
         <button
           class="btn-2"
@@ -69,7 +69,7 @@
           "
           @click.stop="$emit('toInformation', itemInfo)"
         >
-          查看详情
+          {{ i18n.details }}
         </button>
         <button
           class="btn-1"
@@ -78,7 +78,7 @@
           "
           @click.stop="toPayment"
         >
-          立即付款
+          {{ i18n.payment }}
         </button>
         <button
           class="btn-1"
@@ -88,7 +88,7 @@
             itemInfo.status == 'domestic_undelivered'
           "
         >
-          去寄件
+          {{ i18n.mail }}
         </button>
       </view>
     </view>
@@ -102,6 +102,10 @@ export default {
       typeof: Object,
       default: {},
     },
+    language: {
+      typeof: String,
+      default: "",
+    },
   },
   computed: {
     orderDetail() {
@@ -117,6 +121,9 @@ export default {
         return "待寄件";
       }
     },
+    i18n() {
+      return this.$t("index");
+    },
   },
   data() {
     return {};

+ 2 - 0
pageC/myPackage/myPackage.vue

@@ -55,6 +55,7 @@
           :itemInfo="item"
           @toInformation="toInformation"
           @freeze="freeze"
+          :language="language"
         />
       </view>
     </view>
@@ -77,6 +78,7 @@ export default {
       page: 1,
       orderList: [],
       limit: 10,
+      language: this.language, //当前选择的语言
     };
   },
   computed: {

+ 47 - 40
pageD/orderInformation/orderInformation.vue

@@ -24,36 +24,36 @@
       <view class="packaging-center">
         <view class="packaging-left">
           <view class="left-top"> 东莞仓库 </view>
-          <view class="left-bottom"> 始发地 </view>
+          <view class="left-bottom"> {{ i18n.origin }} </view>
         </view>
         <image class="jiantou" src="../../static/mine/339.png" mode=""></image>
         <view class="packaging-left">
           <view class="left-top">
             {{ orderInformation.containerBase.country_name }}
           </view>
-          <view class="left-bottom"> 目的地 </view>
+          <view class="left-bottom"> {{ i18n.destination }} </view>
         </view>
       </view>
       <view class="packaging-time">
         <view class="time">
-          <text>开始时间:</text>
+          <text>{{ i18n.start }}:</text>
           <text>{{
             orderInformation.containerBase.begin_date + "&emsp;"
           }}</text>
         </view>
         <view class="time">
-          <text>截止时间:</text>
+          <text>{{ i18n.cut }}:</text>
           <text>{{ orderInformation.containerBase.end_date }}</text>
         </view>
       </view>
     </view>
     <view class="photo" v-if="orderInformation.status == 'unpaid'">
       <view class="_weight">
-        <text>称重重量</text>
+        <text>{{ i18n.weighingWeight }}</text>
         <text>{{ orderInformation.actual_weight }}kg</text>
       </view>
       <view class="_weight">
-        <text>称重图片</text>
+        <text>{{ i18n.weighingImage }}</text>
         <!-- <view class="_image"> </view> -->
         <image
           :src="orderInformation.weight_images"
@@ -62,7 +62,7 @@
         />
       </view>
       <view class="photo-bottom">
-        <text class="_text-1">需付款</text>
+        <text class="_text-1">{{ i18n.paymentRequired }}</text>
         <view class="price">
           <text style="font-size: 20rpx">¥</text>
           <text>{{ orderInformation.gap_price.split(".")[0] }}</text
@@ -75,7 +75,7 @@
     </view>
     <view class="address">
       <view class="name-phone">
-        <view class="send">  </view>
+        <view class="send"> {{ i18n.send }} </view>
         <view class="name"> {{ orderInformation.from_name }} </view>
         <view class="phone"> {{ orderInformation.from_mobile }} </view>
       </view>
@@ -83,7 +83,7 @@
         {{ orderInformation.from_full_address }}
       </view>
       <view class="name-phone">
-        <view class="send">  </view>
+        <view class="send"> {{ i18n.putAway }} </view>
         <view class="name"> {{ orderInformation.to_name }} </view>
         <view class="phone"> {{ orderInformation.to_mobile }} </view>
       </view>
@@ -98,23 +98,23 @@
 
       <view class="_label-list" v-for="item in orderInformation.goods">
         <view class="information">
-          <text class="_label">物品信息:</text>
+          <text class="_label">{{ i18n.item }}:</text>
           <text class="_value">{{ item.name }}</text>
         </view>
         <view class="information">
-          <text class="_label">件数:</text>
+          <text class="_label">{{ i18n.goodsNum }}:</text>
           <text class="_value">{{ item.number }}</text>
         </view>
         <view class="information">
-          <text class="_label">重量:</text>
+          <text class="_label">{{ i18n.weight }}:</text>
           <text class="_value">{{ item.actual_weight }}kg</text>
         </view>
         <view class="information">
-          <text class="_label">类型:</text>
+          <text class="_label">{{ i18n.typeof }}:</text>
           <text class="_value">{{ item.type_text }}</text>
         </view>
         <view style="display: flex">
-          <text class="_label">跨境物流:</text>
+          <text class="_label">{{ i18n.flow }}:</text>
           <view class="_value">
             <text
               >{{ orderInformation.transportType.name_cn + "&nbsp;" }}
@@ -126,19 +126,21 @@
     </view>
     <view class="num-information">
       <view class="order" style="">
-        <text class="_label-1">订单编号</text>
+        <text class="_label-1">{{ i18n.OrderNumber }}</text>
         <view class="num">
           <text>{{ orderInformation.order_no }}</text
           >{{ "&nbsp;" + "|" + "&nbsp;"
-          }}<text @click="cope(orderInformation.order_no)">复制</text>
+          }}<text @click="cope(orderInformation.order_no)">{{
+            i18n.cope
+          }}</text>
         </view>
       </view>
       <view class="order">
-        <text class="_label-1">下单时间</text>
+        <text class="_label-1">{{ i18n.Ordertime }}</text>
         <view class="num">{{ orderInformation.created_at }} </view>
       </view>
       <view class="order" v-if="isShowPayTime">
-        <text class="_label-1">付款时间</text>
+        <text class="_label-1">{{ i18n.payTime }}</text>
         <view class="num"> {{ orderInformation.paid_at }} </view>
       </view>
 
@@ -150,12 +152,12 @@
           orderInformation.status == 'finished'
         "
       >
-        <text class="_label-1">发货时间</text>
+        <text class="_label-1">{{ i18n.sendTime }}</text>
         <view class="num"> {{ orderInformation.overseas_delivered_at }} </view>
       </view>
 
       <view class="order" v-if="orderInformation.status == 'finished'">
-        <text class="_label-1">签收时间</text>
+        <text class="_label-1">{{ i18n.signForTime }}</text>
         <view class="num"> {{ orderInformation.overseas_received_at }} </view>
       </view>
     </view>
@@ -170,8 +172,8 @@
       <text>{{
         orderInformation.status == "group_unpaid" ||
         orderInformation.status == "unpaid"
-          ? "待付"
-          : "已付"
+          ? i18n.pengingPay
+          : i18n.paid
       }}</text>
       <text style="color: #f83224; font-weight: 600">{{
         orderInformation.actual_price &&
@@ -193,22 +195,24 @@
         @click="toLogistics"
         v-if="orderInformation.status == 'finished'"
       >
-        删除
+        {{ i18n.delete }}
+      </button>
+      <button class="btn-1" @click="toLogistics">
+        {{ i18n.checkLogistics }}
       </button>
-      <button class="btn-1" @click="toLogistics">查看物流</button>
       <button
         class="btn-1"
         @click="fillInformation"
         v-if="orderInformation.status == 'domestic_undelivered'"
       >
-        填写物流信息1
+        {{ i18n.logisticsInformation }}
       </button>
       <button
         class="btn-2"
         @click="toPay"
         v-if="orderInformation.status == 'unpaid'"
       >
-        立即付款
+        {{ i18n.payment }}
       </button>
     </view>
     <view
@@ -228,7 +232,7 @@
           orderInformation.status == 'domestic_undelivered'
         "
       >
-        填写物流信息
+        {{ i18n.logisticsInformation }}
       </button>
 
       <button
@@ -239,7 +243,7 @@
           orderInformation.status == 'domestic_undelivered'
         "
       >
-        去寄件
+        {{ i18n.mail }}
       </button>
       <button
         class="btn-2"
@@ -249,7 +253,7 @@
           orderInformation.status == 'group_unpaid'
         "
       >
-        立即付款
+        {{ i18n.payment }}
       </button></view
     >
     <Fill :show="show" @close="close" />
@@ -296,6 +300,9 @@ export default {
         return false;
       }
     },
+    i18n() {
+      return this.$t("index");
+    },
   },
   onLoad(options) {
     this.orderStauts = options.orderStatus;
@@ -372,7 +379,7 @@ export default {
             frontColor: "#000000",
             backgroundColor: "#f4f4f4",
           });
-          this.orderDetail = "商品已寄往平台,正在运输中";
+          this.orderDetail = this.i18n.toPiattaforma;
           this.orderTitle = this.orderInformation.status_text;
         } else if (this.orderInformation.status == "unpaid") {
           //设置顶部标题栏颜色
@@ -380,7 +387,7 @@ export default {
             frontColor: "#000000",
             backgroundColor: "#f4f4f4",
           });
-          this.orderDetail = "商品已打包称重,等待用户付款";
+          this.orderDetail = this.i18n.peso;
           this.orderTitle = this.orderInformation.status_text;
         } else if (this.orderInformation.status == "overseas_undelivered") {
           //设置顶部标题栏颜色
@@ -388,7 +395,7 @@ export default {
             frontColor: "#000000",
             backgroundColor: "#f4f4f4",
           });
-          this.orderDetail = "等待平台发货";
+          this.orderDetail = this.i18n.waitPiattaforma;
           this.orderTitle = this.orderInformation.status_text;
         } else if (this.orderInformation.status == "overseas_delivered") {
           //设置顶部标题栏颜色
@@ -396,7 +403,7 @@ export default {
             frontColor: "#000000",
             backgroundColor: "#f4f4f4",
           });
-          this.orderDetail = "商品已发出,很快将发货至您的手中";
+          this.orderDetail = this.i18n.prodottoInviato;
           this.orderTitle = this.orderInformation.status_text;
         } else if (this.orderStauts == 4) {
           //设置顶部标题栏颜色
@@ -405,7 +412,7 @@ export default {
             backgroundColor: "#ffffff",
           });
           uni.setNavigationBarTitle({
-            title: "拼包详情",
+            title: this.i18n.insiemeDetail,
           });
         } else if (
           this.orderInformation.status == "finished" ||
@@ -416,7 +423,7 @@ export default {
             frontColor: "#000000",
             backgroundColor: "#f4f4f4",
           });
-          this.orderDetail = "订单签收,交易已完成";
+          this.orderDetail = this.i18n.orderCompleto;
           this.orderTitle = this.orderInformation.status_text;
         } else if (this.orderInformation.status == "domestic_received") {
           //设置顶部标题栏颜色
@@ -424,7 +431,7 @@ export default {
             frontColor: "#000000",
             backgroundColor: "#f4f4f4",
           });
-          this.orderDetail = "等待中转称重发出";
+          this.orderDetail = this.i18n.pesoEmissione;
           this.orderTitle = this.orderInformation.status_text;
         } else if (this.orderInformation.status == "closed") {
           //设置顶部标题栏颜色
@@ -432,7 +439,7 @@ export default {
             frontColor: "#000000",
             backgroundColor: "#f4f4f4",
           });
-          this.orderDetail = "订单关闭";
+          this.orderDetail = this.i18n.orderClose;
           this.orderTitle = this.orderInformation.status_text;
         } else if (this.orderInformation.status == "refunded") {
           //设置顶部标题栏颜色
@@ -440,7 +447,7 @@ export default {
             frontColor: "#000000",
             backgroundColor: "#f4f4f4",
           });
-          this.orderDetail = "订单已退款";
+          this.orderDetail = this.i18n.orderRefund;
           this.orderTitle = this.orderInformation.status_text;
         } else if (this.orderInformation.status == "refunding") {
           //设置顶部标题栏颜色
@@ -448,7 +455,7 @@ export default {
             frontColor: "#000000",
             backgroundColor: "#f4f4f4",
           });
-          this.orderDetail = "订单正在申请退款";
+          this.orderDetail = this.i18n.refunding;
           this.orderTitle = this.orderInformation.status_text;
         } else if (this.orderInformation.status == "domestic_undelivered") {
           //设置顶部标题栏颜色
@@ -456,7 +463,7 @@ export default {
             frontColor: "#000000",
             backgroundColor: "#f4f4f4",
           });
-          this.orderDetail = "商品等待发货中";
+          this.orderDetail = this.i18n.waitCommity;
           this.orderTitle = this.orderInformation.status_text;
         }
       });

+ 1 - 1
pages.json

@@ -385,7 +385,7 @@
 						"enablePullDownRefresh": false,
 					"style" : 
 					{
-						"navigationBarTitleText" : "保证金说明"
+						"navigationBarTitleText" : ""
 					}
 				},
 				{

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/balanceDetail/balanceDetail.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/ensureExplain/ensureExplain.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/ensureMoney/ensureMoney.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/mineFollow/mineFollow.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/myPackage/component/packageCard.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/myPackage/myPackage.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageD/orderInformation/orderInformation.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/mp-weixin/common/main.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/mp-weixin/common/vendor.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/chat/chat.wxml


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/chat/news.wxml


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/counter.wxml


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/service/service.wxml


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/shoplist.wxml


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/subsidy.wxml


+ 1 - 1
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>

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageB/account.wxml


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageB/myPackage.wxml


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageB/recipientinfo.wxml


+ 1 - 1
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>

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageC/balanceDetail/balanceDetail.js


+ 1 - 1
unpackage/dist/dev/mp-weixin/pageC/balanceDetail/balanceDetail.wxml

@@ -1 +1 @@
-<view class="detail data-v-afefcb1c"><view class="tab data-v-afefcb1c"><text data-event-opts="{{[['tap',[['swcthTab',['']]]]]}}" class="{{['data-v-afefcb1c',(selected=='')?'selected':'']}}" bindtap="__e">全部</text><text data-event-opts="{{[['tap',[['swcthTab',['income']]]]]}}" class="{{['data-v-afefcb1c',(selected=='income')?'selected':'']}}" bindtap="__e">收入</text><text data-event-opts="{{[['tap',[['swcthTab',['consume']]]]]}}" class="{{['data-v-afefcb1c',(selected=='consume')?'selected':'']}}" bindtap="__e">支出</text></view><view class="content data-v-afefcb1c"><block wx:for="{{moneyDetail}}" wx:for-item="item" wx:for-index="index" wx:key="index"><money-detail vue-id="{{'58fbb4d4-1-'+index}}" itemInfo="{{item}}" class="data-v-afefcb1c" bind:__l="__l"></money-detail></block></view></view>
+<view class="detail data-v-afefcb1c"><view class="tab data-v-afefcb1c"><text data-event-opts="{{[['tap',[['swcthTab',['']]]]]}}" class="{{['data-v-afefcb1c',(selected=='')?'selected':'']}}" bindtap="__e">{{i18n.whole}}</text><text data-event-opts="{{[['tap',[['swcthTab',['income']]]]]}}" class="{{['data-v-afefcb1c',(selected=='income')?'selected':'']}}" bindtap="__e">{{i18n.income}}</text><text data-event-opts="{{[['tap',[['swcthTab',['consume']]]]]}}" class="{{['data-v-afefcb1c',(selected=='consume')?'selected':'']}}" bindtap="__e">{{i18n.expenditure}}</text></view><view class="content data-v-afefcb1c"><block wx:for="{{moneyDetail}}" wx:for-item="item" wx:for-index="index" wx:key="index"><money-detail vue-id="{{'58fbb4d4-1-'+index}}" itemInfo="{{item}}" class="data-v-afefcb1c" bind:__l="__l"></money-detail></block></view></view>

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageC/ensureExplain/ensureExplain.js


+ 1 - 1
unpackage/dist/dev/mp-weixin/pageC/ensureExplain/ensureExplain.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "保证金说明",
+  "navigationBarTitleText": "",
   "usingComponents": {
     "u-parse": "/uview-ui/components/u-parse/u-parse"
   }

+ 1 - 1
unpackage/dist/dev/mp-weixin/pageC/ensureExplain/ensureExplain.wxml

@@ -1 +1 @@
-<view class="page"><u-parse vue-id="eb6a3088-1" content="{{agreementContent.content_cn}}" bind:__l="__l"></u-parse></view>
+<view class="page"><u-parse vue-id="eb6a3088-1" content="{{agreementContent}}" bind:__l="__l"></u-parse></view>

+ 1 - 1
unpackage/dist/dev/mp-weixin/pageC/ensureMoney/ensureMoney.wxml

@@ -1 +1 @@
-<view class="balance"><view class="shadow"></view><view class="mine-balance"><view class="title"><text>{{i18n.myDeposit+"(元)"}}</text><image class="mine-324" src="../../static/mine/324.png" mode data-event-opts="{{[['tap',[['toExplain',['$event']]]]]}}" bindtap="__e"></image></view><view class="money">{{''+userInformation.deposit+''}}</view><view class="btn-list"><button data-event-opts="{{[['tap',[['toWithdrawal',['$event']]]]]}}" class="withdrawal" bindtap="__e">{{''+i18n.withdrawal+''}}</button><button data-event-opts="{{[['tap',[['toRecharge',['$event']]]]]}}" class="recharge" bindtap="__e">{{''+i18n.recharge+''}}</button></view></view><view class="money-detail"><view class="money-title"><text style="font-weight:600;">{{i18n.depositDetails}}</text><all-right vue-id="174485ea-1" name="{{i18n.whole}}" data-event-opts="{{[['^toDetail',[['toDetail']]]]}}" bind:toDetail="__e" bind:__l="__l"></all-right></view><view><block wx:for="{{moneyDetail}}" wx:for-item="item" wx:for-index="index" wx:key="index"><money-detail vue-id="{{'174485ea-2-'+index}}" itemInfo="{{item}}" bind:__l="__l"></money-detail></block></view></view><view class="bottom-text">没有更多数据了</view></view>
+<view class="balance"><view class="shadow"></view><view class="mine-balance"><view class="title"><text>{{i18n.myDeposit+"(元)"}}</text><image class="mine-324" src="../../static/mine/324.png" mode data-event-opts="{{[['tap',[['toExplain',['$event']]]]]}}" bindtap="__e"></image></view><view class="money">{{''+userInformation.deposit+''}}</view><view class="btn-list"><button data-event-opts="{{[['tap',[['toWithdrawal',['$event']]]]]}}" class="withdrawal" bindtap="__e">{{''+i18n.withdrawal+''}}</button><button data-event-opts="{{[['tap',[['toRecharge',['$event']]]]]}}" class="recharge" bindtap="__e">{{''+i18n.recharge+''}}</button></view></view><view class="money-detail"><view class="money-title"><text style="font-weight:600;">{{i18n.depositDetails}}</text><all-right vue-id="174485ea-1" name="{{i18n.whole}}" data-event-opts="{{[['^toDetail',[['toDetail']]]]}}" bind:toDetail="__e" bind:__l="__l"></all-right></view><view><block wx:for="{{moneyDetail}}" wx:for-item="item" wx:for-index="index" wx:key="index"><money-detail vue-id="{{'174485ea-2-'+index}}" itemInfo="{{item}}" bind:__l="__l"></money-detail></block></view></view><view class="bottom-text">{{''+i18n.noMore+''}}</view></view>

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageC/mineFollow/mineFollow.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageC/mineFollow/mineFollow.wxml


+ 0 - 1
unpackage/dist/dev/mp-weixin/pageC/mineFollow/mineFollow.wxss

@@ -32,7 +32,6 @@
 .page .tab.data-v-49bfb496 {
   display: flex;
   justify-content: space-between;
-  width: 240rpx;
   font-size: 36rpx;
 }
 .page .tab .commodity.data-v-49bfb496 {

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageC/myPackage/component/packageCard.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageC/myPackage/component/packageCard.wxml


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageC/myPackage/myPackage.js


+ 1 - 1
unpackage/dist/dev/mp-weixin/pageC/myPackage/myPackage.wxml

@@ -1 +1 @@
-<view class="data-v-6893e48c"><view class="top-search data-v-6893e48c"><u--input vue-id="ac2da40c-1" placeholder="{{i18n.orderNum}}" prefixIcon="search" shape="circle" prefixIconStyle="font-size: 22px;color: #909399;background: #f4f4f4;" value="{{orderId}}" data-event-opts="{{[['^change',[['getPackageList',[1]]]],['^input',[['__set_model',['','orderId','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-6893e48c" bind:__l="__l"></u--input><view class="top-tab data-v-6893e48c"><view data-event-opts="{{[['tap',[['tabSwitch',['to_transit']]]]]}}" class="{{['tab','data-v-6893e48c',(follow=='to_transit')?'commodity':'']}}" bindtap="__e">{{''+i18n.deliver+statusNum.to_transit+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['transit_receipt']]]]]}}" class="{{['tab','data-v-6893e48c',(follow=='transit_receipt')?'commodity':'']}}" bindtap="__e">{{''+i18n.Sign+" "+statusNum.transit_receipt+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['to_overseas']]]]]}}" class="{{['tab','data-v-6893e48c',(follow=='to_overseas')?'commodity':'']}}" bindtap="__e">{{''+i18n.overseas+" "+statusNum.to_overseas+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['other']]]]]}}" class="{{['tab','data-v-6893e48c',(follow=='other')?'commodity':'']}}" bindtap="__e">{{''+i18n.other+" "+statusNum.other+''}}</view></view></view><view class="content data-v-6893e48c"><view class="prompt data-v-6893e48c"><image class="prompt-icon data-v-6893e48c" src="../../static/mine/336.png" mode></image>{{''+i18n.orderWeight+weights+'kg'}}</view><block wx:for="{{orderList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="orderStatus"><view class="data-v-6893e48c"><package-card vue-id="{{'ac2da40c-2-'+__i0__}}" itemInfo="{{item}}" data-event-opts="{{[['^toInformation',[['toInformation']]],['^freeze',[['freeze']]]]}}" bind:toInformation="__e" bind:freeze="__e" class="data-v-6893e48c" bind:__l="__l"></package-card></view></block></view></view>
+<view class="data-v-6893e48c"><view class="top-search data-v-6893e48c"><u--input vue-id="ac2da40c-1" placeholder="{{i18n.orderNum}}" prefixIcon="search" shape="circle" prefixIconStyle="font-size: 22px;color: #909399;background: #f4f4f4;" value="{{orderId}}" data-event-opts="{{[['^change',[['getPackageList',[1]]]],['^input',[['__set_model',['','orderId','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-6893e48c" bind:__l="__l"></u--input><view class="top-tab data-v-6893e48c"><view data-event-opts="{{[['tap',[['tabSwitch',['to_transit']]]]]}}" class="{{['tab','data-v-6893e48c',(follow=='to_transit')?'commodity':'']}}" bindtap="__e">{{''+i18n.deliver+statusNum.to_transit+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['transit_receipt']]]]]}}" class="{{['tab','data-v-6893e48c',(follow=='transit_receipt')?'commodity':'']}}" bindtap="__e">{{''+i18n.Sign+" "+statusNum.transit_receipt+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['to_overseas']]]]]}}" class="{{['tab','data-v-6893e48c',(follow=='to_overseas')?'commodity':'']}}" bindtap="__e">{{''+i18n.overseas+" "+statusNum.to_overseas+''}}</view><view data-event-opts="{{[['tap',[['tabSwitch',['other']]]]]}}" class="{{['tab','data-v-6893e48c',(follow=='other')?'commodity':'']}}" bindtap="__e">{{''+i18n.other+" "+statusNum.other+''}}</view></view></view><view class="content data-v-6893e48c"><view class="prompt data-v-6893e48c"><image class="prompt-icon data-v-6893e48c" src="../../static/mine/336.png" mode></image>{{''+i18n.orderWeight+weights+'kg'}}</view><block wx:for="{{orderList}}" wx:for-item="item" wx:for-index="__i0__" wx:key="orderStatus"><view class="data-v-6893e48c"><package-card vue-id="{{'ac2da40c-2-'+__i0__}}" itemInfo="{{item}}" language="{{language}}" data-event-opts="{{[['^toInformation',[['toInformation']]],['^freeze',[['freeze']]]]}}" bind:toInformation="__e" bind:freeze="__e" class="data-v-6893e48c" bind:__l="__l"></package-card></view></block></view></view>

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageD/orderInformation/orderInformation.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageD/orderInformation/orderInformation.wxml


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/index.wxml


+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/mine/component/mallOrderForm.json

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

+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/mine/component/mineMoney.json

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

+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/mine/component/personalFunction.json

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

+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/mine/component/teamFunction.json

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

+ 18 - 1
unpackage/dist/dev/mp-weixin/project.config.json

@@ -21,7 +21,24 @@
   "libVersion": "3.4.3",
   "appid": "wx84ab1b5d609b805d",
   "projectname": "kjds",
-  "condition": {},
+  "condition": {
+    "search": {
+      "current": -1,
+      "list": []
+    },
+    "conversation": {
+      "current": -1,
+      "list": []
+    },
+    "game": {
+      "current": -1,
+      "list": []
+    },
+    "miniprogram": {
+      "current": -1,
+      "list": []
+    }
+  },
   "editorSetting": {
     "tabIndent": "insertSpaces",
     "tabSize": 2

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

@@ -4,49 +4,11 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pageC/ensureMoney/ensureMoney",
-          "pathName": "pageC/ensureMoney/ensureMoney",
+          "name": "pageC/myPackage/myPackage",
+          "pathName": "pageC/myPackage/myPackage",
           "query": "",
           "launchMode": "default",
           "scene": null
-<<<<<<< HEAD
-=======
-        },
-        {
-          "name": "",
-          "pathName": "pageD/evaluate/evaluate",
-          "query": "orderId=428",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pageC/orderFormDetail/orderFormDetail",
-          "query": "orderId=428",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pageA/comment",
-          "query": "id=110",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pageA/rule/rule",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pageA/productdetails",
-          "query": "id=142",
-          "launchMode": "default",
-          "scene": null
->>>>>>> d14b7fc6fe7eaa2277787b1cb99b1866196644c6
         }
       ]
     }

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

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

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

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

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

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

Vissa filer visades inte eftersom för många filer har ändrats