6.5提交代码

commont/messages.js

@@ -73,6 +73,9 @@ export default {
 			PCEnd:"PC端",
 			pontact:"联系客服",
 			accountSettings:"账号设置",
+			accountBalance:"账户余额",
+			myBalance:"我的余额",
+			withdrawal:"提现",
 			
 		}
 	},
@@ -150,6 +153,8 @@ export default {
 			PCEnd:"PC end",
 			pontact:"Contact customer service",
 			accountSettings:"Account Settings",
+			accountBalance:"Account Balance",
+			myBalance:"My Balance",
 		}
 	}
 }

pageC/accountBalance/accountBalance.vue

@@ -7,11 +7,11 @@
 
 		<view class="mine-balance">
 			<view class="title">
-				我的余额（元）
+				{{i18n.myBalance}}（元）
 			</view>
 			<view class="money"> 500.00 </view>
 			<view class="btn-list">
-				<button class="withdrawal" @click="toWithdrawal">提现</button>
+				<button class="withdrawal" @click="toWithdrawal">{{i18n.withdrawal}}</button>
 				<button class="recharge" @click="toRecharge">充值</button>
 			</view>
 		</view>
@@ -58,11 +58,19 @@
 				]
 			};
 		},
+		computed:{
+			i18n(){
+				return this.$t("index")
+			}
+		},
 		created() {
 			uni.setNavigationBarColor({
 				frontColor: '#ffffff',
 				backgroundColor: '#f74639'
 			})
+			uni.setNavigationBarTitle({
+				title:this.i18n.accountBalance
+			})
 		},
 		methods: {
 			//跳转明细页面

pageD/productDetails/productDetails.vue

@@ -1,20 +1,40 @@
 <template>
 	<view class="page">
-		<view class="top-fail">
+		<view class="top-fail" v-if="status != 2">
 			<image src="../../static/mine/332.png" class="fail-icon" mode=""></image>
-			<text>涉及敏感文字，您发布的商品审核未通过</text>
+			<text v-if="status == 1">涉及敏感文字，您发布的商品审核未通过</text>
+			<text v-if="status == 3">该商品已下架，如有需要请重新上架</text>
 		</view>
-		<image class="goods-img" src="https://img13.360buyimg.com/jdcms/s460x460_jfs/t1/156379/25/41552/79748/65f821bfF15d37e55/217e9735cdeaac5a.jpg.webp" mode=""></image>
-		<view class="">
-			<text>折扣价</text>
-			<text>￥</text>
-			<text>123</text>.
-			<text>11</text>
+		<view class="fail" v-else>
+			<image src="../../static/mine/333.png" class="fail-icon" mode=""></image>
+			<text>商品还在审核中，请耐心等待</text>
 		</view>
-		<view class="">
+		<image class="goods-img"
+			src="https://img13.360buyimg.com/jdcms/s460x460_jfs/t1/156379/25/41552/79748/65f821bfF15d37e55/217e9735cdeaac5a.jpg.webp"
+			mode=""></image>
+		<view class="price">
+			<text style="font-size: 20rpx;">折扣价</text>
+			<text style="font-size: 18rpx;">￥</text>
+			<text style="font-size: 36rpx; font-weight: 600;">123</text>.
+			<text style="font-size: 18rpx;">11</text>
+		</view>
+		<view class="goods-title">
 			布兰德低温烘焙猫粮全价通用高端鲜肉成猫幼猫
 			干粮 乌骨鸡配方 1kg一袋
 		</view>
+
+		<view class="goods-detail">
+			商品详情
+		</view>
+		<view class="detail">
+			<image class="detail-img"
+				src="https://img13.360buyimg.com/jdcms/s460x460_jfs/t1/156379/25/41552/79748/65f821bfF15d37e55/217e9735cdeaac5a.jpg.webp"
+				mode=""></image>
+		</view>
+
+		<view class="footer">
+			<button class="btn">编辑商品</button>
+		</view>
 	</view>
 </template>
 
@@ -22,40 +42,107 @@
 	export default {
 		data() {
 			return {
-				
+				status: 3
 			}
 		},
 		methods: {
-			
+
 		},
 		mounted() {
 			uni.setNavigationBarTitle({
-				title:"商品详情"
+				title: "商品详情"
 			})
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-.page{
-	background-color: #fff;
-	.top-fail{
-		height: 60rpx;
-		background-color: #fff1ee;
-		padding-left: 24rpx;
-		display: flex;
-		align-items: center;
-		font-size: 24rpx;
-		color: #333;
-		.fail-icon{
-			width: 32rpx;
-			height: 32rpx;
-			margin-right: 10rpx;
+	.page {
+		background-color: #fff;
+
+		.top-fail {
+			height: 60rpx;
+			background-color: #fff1ee;
+			padding-left: 24rpx;
+			display: flex;
+			align-items: center;
+			font-size: 24rpx;
+			color: #333;
+
+			.fail-icon {
+				width: 32rpx;
+				height: 32rpx;
+				margin-right: 10rpx;
+			}
+		}
+
+		.fail {
+			height: 60rpx;
+			background-color: #FFF1D7;
+			padding-left: 24rpx;
+			display: flex;
+			align-items: center;
+			font-size: 24rpx;
+			color: #333;
+
+			.fail-icon {
+				width: 32rpx;
+				height: 32rpx;
+				margin-right: 10rpx;
+			}
+		}
+
+		.goods-img {
+			width: 100%;
+			height: 750rpx;
+		}
+
+		.price {
+			color: #f83224;
+			margin-top: 36rpx;
+			padding-left: 40rpx;
+			font-weight: 600;
+		}
+
+		.goods-title {
+			padding: 0 40rpx;
+			font-size: 32rpx;
+			margin-top: 20rpx;
+		}
+
+		.goods-detail {
+			font-size: 28rpx;
+			margin-top: 84rpx;
+			padding-left: 40rpx;
+		}
+
+		.detail {
+			padding: 24rpx 20rpx;
+
+			.detail-img {
+				width: 100%;
+			}
+		}
+
+		.footer {
+			position: fixed;
+			bottom: 0;
+			width: 100%;
+			padding-bottom: 84rpx;
+			padding-top: 20rpx;
+			background-color: #fff;
+
+			.btn {
+				border-radius: 52rpx;
+				background-color: #f83224;
+				color: #fff;
+				border: none;
+				padding: 0;
+				margin: 0;
+				width: 94%;
+				font-size: 30rpx;
+				margin: 0 auto;
+			}
 		}
 	}
-	.goods-img{
-		width: 100%;
-		height: 750rpx;
-	}
-}
-</style>
+</style>

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -7585,7 +7585,7 @@ var _default = {
       toBeReceived: "待收货",
       refund: "退款/售后",
       leaderunction: "团长功能"
-    }, (0, _defineProperty2.default)(_index, "platform", "平台商品库"), (0, _defineProperty2.default)(_index, "productManagement", "商品管理"), (0, _defineProperty2.default)(_index, "orderManagement", "订单管理"), (0, _defineProperty2.default)(_index, "afterSales", "售后管理"), (0, _defineProperty2.default)(_index, "supplyChain", "供应链商品"), (0, _defineProperty2.default)(_index, "PCEnd", "PC端"), (0, _defineProperty2.default)(_index, "pontact", "联系客服"), (0, _defineProperty2.default)(_index, "accountSettings", "账号设置"), _index)
+    }, (0, _defineProperty2.default)(_index, "platform", "平台商品库"), (0, _defineProperty2.default)(_index, "productManagement", "商品管理"), (0, _defineProperty2.default)(_index, "orderManagement", "订单管理"), (0, _defineProperty2.default)(_index, "afterSales", "售后管理"), (0, _defineProperty2.default)(_index, "supplyChain", "供应链商品"), (0, _defineProperty2.default)(_index, "PCEnd", "PC端"), (0, _defineProperty2.default)(_index, "pontact", "联系客服"), (0, _defineProperty2.default)(_index, "accountSettings", "账号设置"), (0, _defineProperty2.default)(_index, "accountBalance", "账户余额"), (0, _defineProperty2.default)(_index, "myBalance", "我的余额"), (0, _defineProperty2.default)(_index, "withdrawal", "提现"), _index)
   },
   "en-US": {
     index: (_index2 = {
@@ -7653,7 +7653,7 @@ var _default = {
       toBeReceived: "To be received",
       refund: "Refund/After sales",
       leaderunction: "Leader function"
-    }, (0, _defineProperty2.default)(_index2, "platform", "Platform product library"), (0, _defineProperty2.default)(_index2, "productManagement", "Product Management"), (0, _defineProperty2.default)(_index2, "orderManagement", "order management"), (0, _defineProperty2.default)(_index2, "afterSales", "After sales"), (0, _defineProperty2.default)(_index2, "supplyChain", "Supply chain goods"), (0, _defineProperty2.default)(_index2, "PCEnd", "PC end"), (0, _defineProperty2.default)(_index2, "pontact", "Contact customer service"), (0, _defineProperty2.default)(_index2, "accountSettings", "Account Settings"), _index2)
+    }, (0, _defineProperty2.default)(_index2, "platform", "Platform product library"), (0, _defineProperty2.default)(_index2, "productManagement", "Product Management"), (0, _defineProperty2.default)(_index2, "orderManagement", "order management"), (0, _defineProperty2.default)(_index2, "afterSales", "After sales"), (0, _defineProperty2.default)(_index2, "supplyChain", "Supply chain goods"), (0, _defineProperty2.default)(_index2, "PCEnd", "PC end"), (0, _defineProperty2.default)(_index2, "pontact", "Contact customer service"), (0, _defineProperty2.default)(_index2, "accountSettings", "Account Settings"), (0, _defineProperty2.default)(_index2, "accountBalance", "Account Balance"), (0, _defineProperty2.default)(_index2, "myBalance", "My Balance"), _index2)
   }
 };
 exports.default = _default;