Kaynağa Gözat

“配置多语言,修改我的包裹部分”

mabaoyi 6 ay önce
ebeveyn
işleme
d95ce6f405
32 değiştirilmiş dosya ile 405 ekleme ve 251 silme
  1. 68 0
      commont/messages.js
  2. 265 213
      pageC/recharge/recharge.vue
  3. 19 10
      pageC/withdrawal/withdrawal.vue
  4. 3 5
      pageD/afterSalesDetail/component/commodityDetail.vue
  5. 3 2
      pageD/newBulitOrder/component/nextLogistics.vue
  6. 2 2
      pageD/newBulitOrder/newBulitOrder.vue
  7. 22 10
      pageD/orderInformation/orderInformation.vue
  8. 1 1
      pages.json
  9. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  10. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/recharge/recharge.js.map
  11. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/withdrawal/withdrawal.js.map
  12. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageD/afterSalesDetail/component/commodityDetail.js.map
  13. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageD/newBulitOrder/component/nextLogistics.js.map
  14. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageD/newBulitOrder/newBulitOrder.js.map
  15. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageD/orderInformation/orderInformation.js.map
  16. 0 0
      unpackage/dist/dev/mp-weixin/common/vendor.js
  17. 0 0
      unpackage/dist/dev/mp-weixin/pageA/order.wxml
  18. 0 0
      unpackage/dist/dev/mp-weixin/pageC/recharge/recharge.js
  19. 1 1
      unpackage/dist/dev/mp-weixin/pageC/recharge/recharge.json
  20. 0 0
      unpackage/dist/dev/mp-weixin/pageC/recharge/recharge.wxml
  21. 0 0
      unpackage/dist/dev/mp-weixin/pageC/withdrawal/withdrawal.js
  22. 1 1
      unpackage/dist/dev/mp-weixin/pageC/withdrawal/withdrawal.wxml
  23. 0 0
      unpackage/dist/dev/mp-weixin/pageD/afterSalesDetail/component/commodityDetail.js
  24. 0 0
      unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/component/nextLogistics.js
  25. 0 0
      unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/newBulitOrder.js
  26. 0 0
      unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/newBulitOrder.wxml
  27. 0 0
      unpackage/dist/dev/mp-weixin/pageD/orderInformation/orderInformation.js
  28. 0 0
      unpackage/dist/dev/mp-weixin/pageD/orderInformation/orderInformation.wxml
  29. 14 0
      unpackage/dist/dev/mp-weixin/project.private.config.json
  30. 2 2
      unpackage/dist/dev/mp-weixin/uni_modules/lime-painter/components/l-painter-image/l-painter-image.json
  31. 2 2
      unpackage/dist/dev/mp-weixin/uni_modules/lime-painter/components/l-painter/l-painter.json
  32. 2 2
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-swipe-action-item/u-swipe-action-item.json

+ 68 - 0
commont/messages.js

@@ -391,6 +391,29 @@ export default {
       checkLogistics: "查看物流",
       logisticsInformation: "填写物流信息",
       saved: "已保存",
+      //余额提现
+      balanceWithdrawal: "余额提现",
+      paymentMethod: "到账方式",
+      weChatBalance: "微信余额",
+      withdrawalAmount: "提现金额",
+      withdrawAllFunds: "全部提现",
+      moneyAmount: "可提现金额",
+      withdrawImmediately: "立即提现",
+      withdrawalDetails: "提现明细",
+      submitWith: "已提交提现申请",
+      //充值
+      goMoney: "去提现",
+      balanceRecharge: "余额账户充值",
+      customAmount: "输入自定义金额",
+      payMethod: "支付方式",
+      //商城订单
+      differenzaPrezzo: "待补差价",
+      completato: "已完成",
+      annullato: "已取消",
+      refundService: "退款/售后",
+      confirmGoods: "是否确认收货",
+      cancelOrder: "订单已取消",
+      takeOrder: "订单已收货",
     },
   },
   //英语
@@ -786,6 +809,21 @@ export default {
       checkLogistics: "View logistics",
       logisticsInformation: "Fill in logistics information",
       saved: "saved",
+      //余额提现
+      balanceWithdrawal: "Withdrawal of balance",
+      paymentMethod: "Payment method",
+      weChatBalance: "WeChat balance",
+      withdrawalAmount: "Withdrawal amount",
+      withdrawAllFunds: "Withdraw all funds",
+      moneyAmount: "Withdrawable amount",
+      withdrawImmediately: "Withdraw immediately",
+      withdrawalDetails: "Withdrawal details",
+      submitWith: "Submitted withdrawal request",
+      //充值
+      goMoney: "Go withdraw money",
+      balanceRecharge: "Recharge balance account",
+      customAmount: "Enter custom amount",
+      payMethod: "Payment method",
     },
   },
   // 西班牙
@@ -1189,6 +1227,21 @@ export default {
       checkLogistics: "Ver logística",
       logisticsInformation: "Rellene la información logística",
       saved: "Guardado",
+      //余额提现
+      balanceWithdrawal: "Retiro de efectivo del saldo",
+      paymentMethod: "Método de llegada",
+      weChatBalance: "Saldo de Wechat",
+      withdrawalAmount: "Importe del retiro",
+      withdrawAllFunds: "Todos los retiros de efectivo",
+      moneyAmount: "Cantidad que se puede retirar en efectivo",
+      withdrawImmediately: "Retiro inmediato de efectivo",
+      withdrawalDetails: "Detalles del retiro de efectivo",
+      submitWith: "Se ha presentado la solicitud de retiro de efectivo",
+      //充值
+      goMoney: "Ir a retirar efectivo",
+      balanceRecharge: "Recarga de la cuenta de saldo",
+      customAmount: "Introduzca la cantidad personalizada",
+      payMethod: "Método de pago",
     },
   },
   //意大利
@@ -1588,6 +1641,21 @@ export default {
       checkLogistics: "Visualizza la logistica",
       logisticsInformation: "Compila le informazioni logistiche",
       saved: "Salvato",
+      //余额提现
+      balanceWithdrawal: "Ritiro del saldo",
+      paymentMethod: "Metodo di pagamento",
+      weChatBalance: "Saldo WeChat",
+      withdrawalAmount: "Importo del prelievo",
+      withdrawAllFunds: "Prelevare tutti i fondi",
+      moneyAmount: "Importo prelevabile",
+      withdrawImmediately: "Ritira immediatamente",
+      withdrawalDetails: "Dettagli sul ritiro",
+      submitWith: "Richiesta di recesso presentata",
+      //充值
+      goMoney: "Vai a prelevare denaro",
+      balanceRecharge: "Conto di ricarico",
+      customAmount: "Inserisci importo personalizzato",
+      payMethod: "Metodo di pagamento",
     },
   },
 };

+ 265 - 213
pageC/recharge/recharge.vue

@@ -1,220 +1,272 @@
 <template>
-	<view class="recharge">
-		<view class="mine"> 我的余额(元) </view>
-		<view class="money">{{ userInformation.balance }}</view>
-		<view class="to-withdrawal">
-			<AllRight name="去提现" :withdrawal="true" @toDetail="toWithdrawal" />
-		</view>
-		<view class="select-money">
-			<view class="title"> 余额账户充值 </view>
-			<!-- 选择充值金额 -->
-			<view class="select-recharge">
-				<view class="recharge-money" :class="{ 'back-red': backgroundRed == 100 }" @click="selectMoney(100)">
-					<text>¥</text>100
-				</view>
-				<view class="recharge-money" :class="{ 'back-red': backgroundRed == 200 }" @click="selectMoney(200)">
-					<text>¥</text>200
-				</view>
-				<view class="recharge-money" :class="{ 'back-red': backgroundRed == 300 }" @click="selectMoney(300)">
-					<text>¥</text>300
-				</view>
-				<view class="recharge-money" :class="{ 'back-red': backgroundRed == 600 }" @click="selectMoney(600)">
-					<text>¥</text>600
-				</view>
-				<view class="recharge-money" :class="{ 'back-red': backgroundRed == 800 }" @click="selectMoney(800)">
-					<text>¥</text>800
-				</view>
-				<view class="recharge-money" :class="{ 'back-red': backgroundRed == 1000 }" @click="selectMoney(1000)">
-					<text>¥</text>1000
-				</view>
-			</view>
-			<!-- 选择充值金额 -->
-			<u--input placeholder="输入自定义金额" prefixIcon="rmb" v-model="rmb"
-				prefixIconStyle="font-size: 36rpx;color: #000;font-weight:600"></u--input>
-
-			<view class="payment">
-				<view class="title"> 支付方式 </view>
-				<view class="wx-pay">
-					<view class="logo">
-						<image src="../../static/mine/323.png" class="wx-logo" mode=""></image>
-						微信支付
-					</view>
-					<image src="../../static/mine/330.png" mode="scaleToFill" class="wx-logo" />
-				</view>
-			</view>
-			<button class="recharge-btn" @click="recharge">充值</button>
-		</view>
-	</view>
+  <view class="recharge">
+    <view class="mine"> {{ i18n.myBalance }}(元) </view>
+    <view class="money">{{ userInformation.balance }}</view>
+    <view class="to-withdrawal">
+      <AllRight
+        :name="i18n.goMoney"
+        :withdrawal="true"
+        @toDetail="toWithdrawal"
+      />
+    </view>
+    <view class="select-money">
+      <view class="title"> {{ i18n.balanceRecharge }} </view>
+      <!-- 选择充值金额 -->
+      <view class="select-recharge">
+        <view
+          class="recharge-money"
+          :class="{ 'back-red': backgroundRed == 100 }"
+          @click="selectMoney(100)"
+        >
+          <text>¥</text>100
+        </view>
+        <view
+          class="recharge-money"
+          :class="{ 'back-red': backgroundRed == 200 }"
+          @click="selectMoney(200)"
+        >
+          <text>¥</text>200
+        </view>
+        <view
+          class="recharge-money"
+          :class="{ 'back-red': backgroundRed == 300 }"
+          @click="selectMoney(300)"
+        >
+          <text>¥</text>300
+        </view>
+        <view
+          class="recharge-money"
+          :class="{ 'back-red': backgroundRed == 600 }"
+          @click="selectMoney(600)"
+        >
+          <text>¥</text>600
+        </view>
+        <view
+          class="recharge-money"
+          :class="{ 'back-red': backgroundRed == 800 }"
+          @click="selectMoney(800)"
+        >
+          <text>¥</text>800
+        </view>
+        <view
+          class="recharge-money"
+          :class="{ 'back-red': backgroundRed == 1000 }"
+          @click="selectMoney(1000)"
+        >
+          <text>¥</text>1000
+        </view>
+      </view>
+      <!-- 选择充值金额 -->
+      <u--input
+        :placeholder="i18n.customAmount"
+        prefixIcon="rmb"
+        v-model="rmb"
+        prefixIconStyle="font-size: 36rpx;color: #000;font-weight:600"
+      ></u--input>
+
+      <view class="payment">
+        <view class="title"> {{ i18n.payMethod }} </view>
+        <view class="wx-pay">
+          <view class="logo">
+            <image
+              src="../../static/mine/323.png"
+              class="wx-logo"
+              mode=""
+            ></image>
+            {{ i18n.WechatPay }}
+          </view>
+          <image
+            src="../../static/mine/330.png"
+            mode="scaleToFill"
+            class="wx-logo"
+          />
+        </view>
+      </view>
+      <button class="recharge-btn" @click="recharge">
+        {{ i18n.recharge }}
+      </button>
+    </view>
+  </view>
 </template>
 
 <script>
-	import AllRight from "../mineComponent/allRight/allRight.vue";
-
-	export default {
-		components: {
-			AllRight,
-		},
-		data() {
-			return {
-				backgroundRed: 0,
-				rmb: "",
-				userInformation: {},
-			};
-		},
-		onShow() {
-			this.getBalance();
-		},
-		methods: {
-			selectMoney(num) {
-				this.backgroundRed = num;
-			},
-			toWithdrawal() {
-				uni.navigateTo({
-					url: "/pageC/withdrawal/withdrawal?type=balance",
-				});
-			},
-			//充值
-			recharge() {
-				let num = this.rmb == "" ? this.backgroundRed : this.rmb;
-				uni.$u.http
-					.post(`/api/recharge`, {
-						account_type: "balance",
-						amount: num,
-					})
-					.then((res) => {
-						uni.requestPayment({
-							provider: 'wxpay',
-							timeStamp: String(res.timeStamp),
-							nonceStr: res.nonceStr,
-							package: res.package,
-							signType: res.signType,
-							paySign: res.paySign,
-							success: function(res) {
-								console.log('success:' + JSON.stringify(res));
-								uni.navigateBack()
-							},
-							fail: function(err) {
-								console.log('fail:' + JSON.stringify(err));
-							}
-						});
-						console.log(res);
-					});
-			},
-			//获取账户余额
-			getBalance() {
-				uni.$u.http.get(`/api/member/info`).then((res) => {
-					this.userInformation = res;
-				});
-			},
-		},
-	};
+import AllRight from "../mineComponent/allRight/allRight.vue";
+
+export default {
+  components: {
+    AllRight,
+  },
+  data() {
+    return {
+      backgroundRed: 0,
+      rmb: "",
+      userInformation: {},
+    };
+  },
+  onShow() {
+    this.getBalance();
+  },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
+  methods: {
+    selectMoney(num) {
+      this.backgroundRed = num;
+    },
+    toWithdrawal() {
+      uni.navigateTo({
+        url: "/pageC/withdrawal/withdrawal?type=balance",
+      });
+    },
+    //充值
+    recharge() {
+      let num = this.rmb == "" ? this.backgroundRed : this.rmb;
+      uni.$u.http
+        .post(`/api/recharge`, {
+          account_type: "balance",
+          amount: num,
+        })
+        .then((res) => {
+          uni.requestPayment({
+            provider: "wxpay",
+            timeStamp: String(res.timeStamp),
+            nonceStr: res.nonceStr,
+            package: res.package,
+            signType: res.signType,
+            paySign: res.paySign,
+            success: function (res) {
+              console.log("success:" + JSON.stringify(res));
+              uni.navigateBack();
+            },
+            fail: function (err) {
+              console.log("fail:" + JSON.stringify(err));
+            },
+          });
+          console.log(res);
+        });
+    },
+    //获取账户余额
+    getBalance() {
+      uni.$u.http.get(`/api/member/info`).then((res) => {
+        this.userInformation = res;
+      });
+    },
+  },
+  mounted() {
+    uni.setNavigationBarTitle({
+      title: this.i18n.recharge,
+    });
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.recharge {
-		height: 100vh;
-		background-color: #fff;
-
-		.mine {
-			padding-top: 63rpx;
-			text-align: center;
-			color: #222;
-			font-size: 28rpx;
-			border-top: 1px solid #ccc;
-		}
-
-		.money {
-			font-size: 84rpx;
-			text-align: center;
-			color: #222;
-			font-weight: 600;
-			margin-top: 28rpx;
-			margin-bottom: 20rpx;
-		}
-
-		.to-withdrawal {
-			display: flex;
-			justify-content: center;
-		}
-
-		.select-money {
-			padding-top: 42rpx;
-			border-top: 1px solid #ccc;
-			margin: 0 auto;
-			margin-top: 64rpx;
-			width: 94%;
-
-			.title {
-				font-size: 32rpx;
-				color: #222;
-				font-weight: 500;
-				margin-bottom: 36rpx;
-			}
-
-			.payment {
-				margin-top: 46rpx;
-
-				.wx-pay {
-					height: 100rpx;
-					background-color: #f4f4f4;
-					width: 94%;
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-					padding: 0 20rpx;
-					font-size: 32rpx;
-
-					.logo {
-						display: flex;
-						align-items: center;
-					}
-
-					.wx-logo {
-						width: 39rpx;
-						height: 34rpx;
-						margin-right: 18rpx;
-					}
-				}
-			}
-
-			.recharge-btn {
-				background-color: #f83224;
-				border-radius: 44rpx;
-				color: #fff;
-				margin-top: 150rpx;
-			}
-
-			.select-recharge {
-				display: flex;
-				justify-content: space-between;
-				flex-wrap: wrap;
-
-				.recharge-money {
-					width: 210rpx;
-					height: 120rpx;
-					border: 1px solid #f83224;
-					border-radius: 16rpx;
-					text-align: center;
-					line-height: 120rpx;
-					font-size: 40rpx;
-					font-weight: 600;
-					margin-bottom: 26rpx;
-
-					text {
-						font-size: 24rpx;
-					}
-				}
-
-				.back-red {
-					background-color: #f83224;
-					color: #fff;
-				}
-			}
-		}
-	}
-
-	/deep/.u-input {
-		background-color: #f4f4f4;
-		height: 80rpx;
-	}
-</style>
+.recharge {
+  height: 100vh;
+  background-color: #fff;
+
+  .mine {
+    padding-top: 63rpx;
+    text-align: center;
+    color: #222;
+    font-size: 28rpx;
+    border-top: 1px solid #ccc;
+  }
+
+  .money {
+    font-size: 84rpx;
+    text-align: center;
+    color: #222;
+    font-weight: 600;
+    margin-top: 28rpx;
+    margin-bottom: 20rpx;
+  }
+
+  .to-withdrawal {
+    display: flex;
+    justify-content: center;
+  }
+
+  .select-money {
+    padding-top: 42rpx;
+    border-top: 1px solid #ccc;
+    margin: 0 auto;
+    margin-top: 64rpx;
+    width: 94%;
+
+    .title {
+      font-size: 32rpx;
+      color: #222;
+      font-weight: 500;
+      margin-bottom: 36rpx;
+    }
+
+    .payment {
+      margin-top: 46rpx;
+
+      .wx-pay {
+        height: 100rpx;
+        background-color: #f4f4f4;
+        width: 94%;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 0 20rpx;
+        font-size: 32rpx;
+
+        .logo {
+          display: flex;
+          align-items: center;
+        }
+
+        .wx-logo {
+          width: 39rpx;
+          height: 34rpx;
+          margin-right: 18rpx;
+        }
+      }
+    }
+
+    .recharge-btn {
+      background-color: #f83224;
+      border-radius: 44rpx;
+      color: #fff;
+      margin-top: 150rpx;
+    }
+
+    .select-recharge {
+      display: flex;
+      justify-content: space-between;
+      flex-wrap: wrap;
+
+      .recharge-money {
+        width: 210rpx;
+        height: 120rpx;
+        border: 1px solid #f83224;
+        border-radius: 16rpx;
+        text-align: center;
+        line-height: 120rpx;
+        font-size: 40rpx;
+        font-weight: 600;
+        margin-bottom: 26rpx;
+
+        text {
+          font-size: 24rpx;
+        }
+      }
+
+      .back-red {
+        background-color: #f83224;
+        color: #fff;
+      }
+    }
+  }
+}
+
+/deep/.u-input {
+  background-color: #f4f4f4;
+  height: 80rpx;
+}
+</style>

+ 19 - 10
pageC/withdrawal/withdrawal.vue

@@ -2,30 +2,34 @@
   <view class="withdrawal">
     <!-- 提现头部 -->
     <view class="withdrawal-top">
-      <view class="title"> 到账方式 </view>
+      <view class="title"> {{ i18n.paymentMethod }} </view>
       <view class="wx">
         <image src="../../static/mine/323.png" class="wx-logo" mode=""></image>
-        <text>微信余额</text>
+        <text>{{ i18n.weChatBalance }}</text>
       </view>
     </view>
     <!-- 提现头部 -->
     <view class="content">
-      <view class="money"> 提现金额 </view>
+      <view class="money"> {{ i18n.withdrawalAmount }} </view>
       <view class="inp">
         <text>¥</text>
         <input type="number" v-model="money" />
-        <text style="color: #f83224" @click="whole">全部提现</text>
+        <text style="color: #f83224" @click="whole">{{
+          i18n.withdrawAllFunds
+        }}</text>
       </view>
       <text class="all-money" v-if="type == 'balance'"
-        >可提现金额¥{{ userInformation.balance }}</text
+        >{{ i18n.moneyAmount }}¥{{ userInformation.balance }}</text
       >
       <text class="all-money" v-else
-        >可提现金额¥{{ userInformation.deposit }}</text
+        >{{ i18n.moneyAmount }}¥{{ userInformation.deposit }}</text
       >
       <button class="immediately" @click="immediatelyWithdrawal">
-        立即提现
+        {{ i18n.withdrawImmediately }}
       </button>
-      <view class="detail" @click="toWithdrawalDetail"> 提现明细 </view>
+      <view class="detail" @click="toWithdrawalDetail">
+        {{ i18n.withdrawalDetails }}
+      </view>
     </view>
     <u-toast ref="uToast"></u-toast>
   </view>
@@ -40,12 +44,17 @@ export default {
       type: "",
     };
   },
+  computed: {
+    i18n() {
+      return this.$t("index");
+    },
+  },
   onLoad(options) {
     this.type = options.type;
     if (options.type == "deposit") {
       uni.setNavigationBarTitle({ title: "保证金提现" });
     } else {
-      uni.setNavigationBarTitle({ title: "余额提现" });
+      uni.setNavigationBarTitle({ title: this.i18n.balanceWithdrawal });
     }
   },
   methods: {
@@ -64,7 +73,7 @@ export default {
           this.$refs.uToast.show({
             type: "default",
             title: "默认主题",
-            message: "已提交提现申请",
+            message: this.i18n.submitWith,
           });
         });
     },

+ 3 - 5
pageD/afterSalesDetail/component/commodityDetail.vue

@@ -111,11 +111,9 @@ export default {
     },
     // 买家实付金额
     payMoney() {
-      let money = 0;
-      this.orderInformation.goods.map((item) => {
-        money = money + Number(item.amount);
-      });
-      return String(money.toFixed(2));
+      if (this.orderInformation.goods.length > 0) {
+        return this.orderInformation.goods[0].amount;
+      }
     },
     //退款金额
     refundMoney() {

+ 3 - 2
pageD/newBulitOrder/component/nextLogistics.vue

@@ -135,6 +135,7 @@ export default {
       unit_fee: "", //满减价格
       unchangedFreight: "", //基础运费,不会变
       unchangedUnit_price: "",
+      goodsWeight: 0,
     };
   },
   watch: {
@@ -169,12 +170,11 @@ export default {
               this.sum = this.containerList[0].sum;
               this.unchangedFreight = this.containerList[0].sum;
             }
-            console.log(this.sum);
             this.unit_price = this.containerList[0].unit_price;
             this.unchangedUnit_price = this.containerList[0].unit_price;
             this.recommend_weight = this.containerList[0].recommend_weight;
             this.containid = this.containerList[0].id;
-            this.containname = this.containerList[0].name_cn; //等待后续更改language删除掉
+            this.goodsWeight = this.containerList[0].weight_total;
             if (this.language == "zh-CN") {
               this.containname = this.containerList[0].name_cn;
             }
@@ -250,6 +250,7 @@ export default {
           unit_fee: this.unit_fee,
           unchangedFreight: this.unchangedFreight,
           unchangedUnit_price: this.unchangedUnit_price,
+          goodsWeight: this.goodsWeight,
         };
         console.log(data);
         this.$emit("closeLogistics", data);

+ 2 - 2
pageD/newBulitOrder/newBulitOrder.vue

@@ -79,7 +79,7 @@
     <view class="btn u-flex u-row-right">
       <view class="u-flex">
         <text class="kg" v-show="containname"
-          >{{ i18n.Atotalof }}{{ goodsWeight }}kg,</text
+          >{{ i18n.Atotalof }}{{ countGoodsInformation.goodsWeight }}kg,</text
         >
         <text>{{ i18n.total }}:</text>
         <text class="money" style="font-size: 28rpx">¥</text>
@@ -121,7 +121,7 @@ export default {
       swiptlist: [], //推荐商品
       goodsList: [], //需要下单的商品
       logisticsShow: false, //打开选择物流窗口
-      language: "", //语言
+      language: this._language, //语言
       nextLogisticsShow: false, //打开选择货柜窗口
       goodinfo: {}, //商品信息
       goodsValue: 0, //商品数量

+ 22 - 10
pageD/orderInformation/orderInformation.vue

@@ -217,14 +217,7 @@
         {{ i18n.payment }}
       </button>
     </view>
-    <view
-      class="footer"
-      v-else-if="
-        orderInformation.status == 'domestic_undelivered' ||
-        orderInformation.status == 'unpaid' ||
-        orderInformation.status == 'group_unpaid'
-      "
-    >
+    <view class="footer" v-else-if="isShowFooter">
       <button
         class="btn-1"
         @click="fillInformation"
@@ -237,7 +230,7 @@
         {{ i18n.logisticsInformation }}
       </button>
 
-      <button
+      <!-- <button
         class="btn-2"
         @click="toSending"
         v-if="
@@ -246,7 +239,7 @@
         "
       >
         {{ i18n.mail }}
-      </button>
+      </button> -->
       <button
         class="btn-2"
         @click="toPay"
@@ -302,6 +295,25 @@ export default {
         return false;
       }
     },
+    //是否显示底部按钮
+    isShowFooter() {
+      if (
+        this.orderInformation.type == "mall_order" &&
+        this.orderInformation.status == "domestic_undelivered"
+      ) {
+        return false;
+      } else if (
+        this.orderInformation.type != "mall_order" &&
+        this.orderInformation.status == "domestic_undelivered"
+      ) {
+        return true;
+      } else if (
+        this.orderInformation.status == "unpaid" ||
+        this.orderInformation.status == "group_unpaid"
+      ) {
+        return true;
+      }
+    },
     i18n() {
       return this.$t("index");
     },

+ 1 - 1
pages.json

@@ -351,7 +351,7 @@
 						"enablePullDownRefresh": false,
 					"style" : 
 					{
-						"navigationBarTitleText" : "充值"
+						"navigationBarTitleText" : ""
 					}
 				},
 				{

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/recharge/recharge.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/withdrawal/withdrawal.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageD/afterSalesDetail/component/commodityDetail.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageD/newBulitOrder/component/nextLogistics.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageD/newBulitOrder/newBulitOrder.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageD/orderInformation/orderInformation.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/mp-weixin/common/vendor.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/order.wxml


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageC/recharge/recharge.js


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

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "充值",
+  "navigationBarTitleText": "",
   "usingComponents": {
     "u--input": "/uview-ui/components/u--input/u--input",
     "all-right": "/pageC/mineComponent/allRight/allRight"

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageC/recharge/recharge.wxml


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageC/withdrawal/withdrawal.js


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

@@ -1 +1 @@
-<view class="withdrawal data-v-4a36c7f6"><view class="withdrawal-top data-v-4a36c7f6"><view class="title data-v-4a36c7f6">到账方式</view><view class="wx data-v-4a36c7f6"><image class="wx-logo data-v-4a36c7f6" src="../../static/mine/323.png" mode></image><text class="data-v-4a36c7f6">微信余额</text></view></view><view class="content data-v-4a36c7f6"><view class="money data-v-4a36c7f6">提现金额</view><view class="inp data-v-4a36c7f6"><text class="data-v-4a36c7f6">¥</text><input type="number" data-event-opts="{{[['input',[['__set_model',['','money','$event',[]]]]]]}}" value="{{money}}" bindinput="__e" class="data-v-4a36c7f6"/><text data-event-opts="{{[['tap',[['whole',['$event']]]]]}}" style="color:#f83224;" bindtap="__e" class="data-v-4a36c7f6">全部提现</text></view><block wx:if="{{type=='balance'}}"><text class="all-money data-v-4a36c7f6">{{"可提现金额¥"+userInformation.balance}}</text></block><block wx:else><text class="all-money data-v-4a36c7f6">{{"可提现金额¥"+userInformation.deposit}}</text></block><button data-event-opts="{{[['tap',[['immediatelyWithdrawal',['$event']]]]]}}" class="immediately data-v-4a36c7f6" bindtap="__e">立即提现</button><view data-event-opts="{{[['tap',[['toWithdrawalDetail',['$event']]]]]}}" class="detail data-v-4a36c7f6" bindtap="__e">提现明细</view></view><u-toast vue-id="06ba9060-1" data-ref="uToast" class="data-v-4a36c7f6 vue-ref" bind:__l="__l"></u-toast></view>
+<view class="withdrawal data-v-4a36c7f6"><view class="withdrawal-top data-v-4a36c7f6"><view class="title data-v-4a36c7f6">{{''+i18n.paymentMethod+''}}</view><view class="wx data-v-4a36c7f6"><image class="wx-logo data-v-4a36c7f6" src="../../static/mine/323.png" mode></image><text class="data-v-4a36c7f6">{{i18n.weChatBalance}}</text></view></view><view class="content data-v-4a36c7f6"><view class="money data-v-4a36c7f6">{{''+i18n.withdrawalAmount+''}}</view><view class="inp data-v-4a36c7f6"><text class="data-v-4a36c7f6">¥</text><input type="number" data-event-opts="{{[['input',[['__set_model',['','money','$event',[]]]]]]}}" value="{{money}}" bindinput="__e" class="data-v-4a36c7f6"/><text data-event-opts="{{[['tap',[['whole',['$event']]]]]}}" style="color:#f83224;" bindtap="__e" class="data-v-4a36c7f6">{{i18n.withdrawAllFunds}}</text></view><block wx:if="{{type=='balance'}}"><text class="all-money data-v-4a36c7f6">{{i18n.moneyAmount+"¥"+userInformation.balance}}</text></block><block wx:else><text class="all-money data-v-4a36c7f6">{{i18n.moneyAmount+"¥"+userInformation.deposit}}</text></block><button data-event-opts="{{[['tap',[['immediatelyWithdrawal',['$event']]]]]}}" class="immediately data-v-4a36c7f6" bindtap="__e">{{''+i18n.withdrawImmediately+''}}</button><view data-event-opts="{{[['tap',[['toWithdrawalDetail',['$event']]]]]}}" class="detail data-v-4a36c7f6" bindtap="__e">{{''+i18n.withdrawalDetails+''}}</view></view><u-toast vue-id="06ba9060-1" data-ref="uToast" class="data-v-4a36c7f6 vue-ref" bind:__l="__l"></u-toast></view>

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageD/afterSalesDetail/component/commodityDetail.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/component/nextLogistics.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/newBulitOrder.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/newBulitOrder.wxml


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageD/orderInformation/orderInformation.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageD/orderInformation/orderInformation.wxml


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

@@ -4,6 +4,20 @@
     "miniprogram": {
       "list": [
         {
+          "name": "pageC/recharge/recharge",
+          "pathName": "pageC/recharge/recharge",
+          "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": "",

+ 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/l-painter.json

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

+ 2 - 2
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
+  }
 }

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor