Browse Source

feat:全局“寄售”改“寄卖”

DaMoWang 2 years ago
parent
commit
826e280b7b

+ 1 - 1
src/pages.json

@@ -87,7 +87,7 @@
 		{
 			"path": "pages/account/consignment",
 			"style": {
-				"navigationBarTitleText": "寄"
+				"navigationBarTitleText": "寄"
 			}
 		},
 		{

+ 11 - 11
src/pages/account/consignment.vue

@@ -6,24 +6,24 @@
 		</view>
 		<!-- 顶部导航-end -->
 		
-		<!-- 寄列表 -->
+		<!-- 寄列表 -->
 		<view class="con">
 			<view class="goods flex_c" v-for="(item,index) in goods" :key="index" @tap="navToSpeedUp(item,index)">
 				<view class="flex_r">
 					<image class="goods_img" :src="item.original_img" mode=""></image>
 					<view class="goods_info flex_c flex_jc">
 						<view class="goods_name ellipsis">{{item.goods_name}}</view>
-						<view class="period">寄数量:{{item.surplus_num}}套</view>
+						<view class="period">寄数量:{{item.surplus_num}}套</view>
 					</view>
 					<view class="goods_status flex_grow flex_r flex_je" :class="item.status === 0 ? 'g_color' : item.status == 1 ? 'g_color' : item.status == 2 ? 'y_color' : 'r_color'">
-						{{item.status === 0 ? '寄售中' : item.status == 1 ? '寄售成功' : item.status == 2 ? '寄售失败' : '寄售转邮递'}}
+						{{item.status === 0 ? '寄卖中' : item.status == 1 ? '寄卖成功' : item.status == 2 ? '寄卖失败' : '寄卖转邮递'}}
 					</view>
 				</view>
 				<view class="goods_time">{{$day(item.start_sell_time*1000).format("YYYY-MM-DD HH:mm:ss")}}</view>
 			</view>
 		</view>
-		<!-- 寄列表-end -->
-		<not-goods v-if="haveGoods" textStr="暂无寄信息"></not-goods>
+		<!-- 寄列表-end -->
+		<not-goods v-if="haveGoods" textStr="暂无寄信息"></not-goods>
 	</view>
 </template>
 
@@ -44,16 +44,16 @@ import uniPopup from '@/components/uni-popup/uni-popup.vue'
 				current: 0,
 				TabList:[
 					{title:'全部',status:0},
-					{title:'寄中',status:1},
-					{title:'寄成功',status:2},
-					{title:'寄失败',status:3},
+					{title:'寄中',status:1},
+					{title:'寄成功',status:2},
+					{title:'寄失败',status:3},
 				],
 				goods: [],
 				haveGoods: false, // 是否有商品
 				selectIndex:'',
 				isShow:false ,// 是否显示地址
 				DefaultAddress:'' ,// 地址
-				pay_way:0 // 操作-0:再次寄;1:收货
+				pay_way:0 // 操作-0:再次寄;1:收货
 			};
 		},
 		onLoad(){
@@ -161,7 +161,7 @@ page{background: #F4F4F4;}
 .active{color: #1BBD89;border-bottom: 6rpx solid #1BBD89;}
 // 顶部列表-end
 
-// 寄列表
+// 寄列表
 .goods_info{width: 300rpx;overflow: hidden;}
 .period{font-size: 26rpx;color:#5D5C5C;margin-top: 24rpx;}
 .goods_status{font-size: 30rpx;font-family: "SourceHanSansCN-Medium";}
@@ -170,7 +170,7 @@ page{background: #F4F4F4;}
 .goods_img{width: 150rpx;height: 138.8rpx;margin-right: 36rpx;border-radius: 8rpx;}
 .goods_name{width: 100%;overflow: hidden;font-size: 32rpx;color: #373636;font-family: "SourceHanSansCN-Medium";}
 .goods{width: 100%;overflow: hidden;padding:24rpx 20rpx;box-sizing: border-box;background: #fff;border-radius: 12rpx;margin-bottom: 30rpx;}
-// 寄列表-end
+// 寄列表-end
 
 // 状态颜色
 .g_color{color: #1BBD89 !important;}

+ 1 - 1
src/pages/accountDetails/running.vue

@@ -108,7 +108,7 @@ export default {
           case 3: return "购买产品支出";
           case 4: return "社区消费奖励";
           case 5: return "合伙人分红收益";
-          case 6: return "寄成功收益";
+          case 6: return "寄成功收益";
           case 7: return "退款到余额";
           case 8: return "赠送支出";
           case 9: return "转化支出";

+ 1 - 1
src/pages/my/index.vue

@@ -88,7 +88,7 @@
           </navigator>
           <navigator class="fun_list flex_c flex_ac" url="/pages/account/consignment" hover-class="none">
             <image class="fun_img" src="/static/my/consign.png" mode=""></image>
-            <view class="fun_text">寄</view>
+            <view class="fun_text">寄</view>
           </navigator>
           <navigator class="fun_list flex_c flex_ac" url="/pages/account/giveAsPresent" hover-class="none">
             <image class="fun_img" src="/static/my/give.png" mode=""></image>

+ 1 - 1
src/pages/product/p_details.vue

@@ -136,7 +136,7 @@
               class="raido_img"
               :class="pfway == '1' ? 'raido_box' : ''"
             ></view>
-            <view class="raido_text">申请寄</view>
+            <view class="raido_text">申请寄</view>
           </view>
           <view class="goods_raido flex_r flex_ac" @tap="setWay('0')">
             <view

+ 5 - 5
src/pages/speed-up/index.vue

@@ -2,7 +2,7 @@
 	<view class="container">
 		<!-- 匹配周期 -->
 		<view class="matching mar_t20 flex_r flex_ac flex_jb">
-			<view class="match_name">{{detail.status === 0 ? '寄售中' : detail.status == 1 ? '寄售成功' : detail.status == 2 ? '寄售失败' : '寄售转邮递'}}</view>
+			<view class="match_name">{{detail.status === 0 ? '寄卖中' : detail.status == 1 ? '寄卖成功' : detail.status == 2 ? '寄卖失败' : '寄卖转邮递'}}</view>
 			<view class="match_day flex_r flex_ae">
 				<block v-if="detail.status === 0">
 					<text>{{dayNum}}</text>天 <view style="margin-left: 20rpx;">{{timeNum}}</view>
@@ -50,7 +50,7 @@
 			<view class="sign_con flex_r flex_ac flex_jb">
 				<view class="sign_insfo flex_c flex_jc">
 					<view class="sign_name">分享加速</view>
-					<view class="sign_msg" style="max-width: 80%;">分享新用户在零售专区消费可获得加速,直至最快寄匹配周期。</view>
+					<view class="sign_msg" style="max-width: 80%;">分享新用户在零售专区消费可获得加速,直至最快寄匹配周期。</view>
 				</view>
 				<view class="pro_con">
 					<image src="/static/img/promotion.png" mode=""></image>
@@ -112,7 +112,7 @@ import cmdProgress from "@/components/cmd-progress/cmd-progress.vue"
 				})
 			},
 			timeCalculate(data){
-				console.log("寄结束:",this.$day(data.create_time).add(19 - data.speed_days, 'day').format("YYYY-MM-DD HH:mm:ss"));
+				console.log("寄结束:",this.$day(data.create_time).add(19 - data.speed_days, 'day').format("YYYY-MM-DD HH:mm:ss"));
 				// console.log(this.$day().subtract(data.ojsDay - this.speedUpDayNum, 'day').format("YYYY-MM-DD HH:mm:ss"));
 
 				let endTime = data.end_sell_time;
@@ -133,7 +133,7 @@ import cmdProgress from "@/components/cmd-progress/cmd-progress.vue"
 							clearInterval(time)
 							uni.showModal({
 							    title: '提示',
-							    content: '寄完成,请返回列表查看结果',
+							    content: '寄完成,请返回列表查看结果',
 							    success: function (res) {
 							        if (res) {
 							            uni.navigateBack({
@@ -164,7 +164,7 @@ import cmdProgress from "@/components/cmd-progress/cmd-progress.vue"
 							clearInterval(tim)
 							uni.showModal({
 							    title: '提示',
-							    content: '寄完成,请返回列表查看结果',
+							    content: '寄完成,请返回列表查看结果',
 							    success: function (res) {
 							        if (res) {
 							            uni.navigateBack({

+ 1 - 1
src/pages/to-pay-list/index.vue

@@ -172,7 +172,7 @@ export default {
 
             // 计算待支付
             let p = this.Data.type == 2 ? this.goodsInfo.trade_price : this.goodsInfo.cost_price; //商品单价
-            let y = (this.Data.is_sell == 1 || this.Data.prom_type == 1) ? 0 : this.freight; // 运费   寄的话退运费为0
+            let y = (this.Data.is_sell == 1 || this.Data.prom_type == 1) ? 0 : this.freight; // 运费   寄的话退运费为0
             // let a = p * this.Data.num + y * this.Data.num; //商品总价
             // let b = a - this.userinfo.user_money; //待支付金额
             let a = this.$h.Mul(p,this.Data.num) + this.$h.Mul(y,this.Data.num); //商品总价