MONSTER-ygh vor 10 Monaten
Ursprung
Commit
0d55ecfc1c

+ 3 - 3
components/customPromotionCode/customPromotionCode.vue

@@ -104,7 +104,7 @@ import { nextTick } from "vue"
 								ctx.drawImage(img1, 0, 0, w, h);
 
 								// 绘制海报二维码
-								ctx.drawImage(img2, w-80, h-80, 70, 70);
+								ctx.drawImage(img2, w/2-40, h/2+40, 70, 70);
 
 								// 绘制完成后导出图片并显示
 								ctx.draw(false, () => {
@@ -254,8 +254,8 @@ import { nextTick } from "vue"
 		align-items: center;
 		position: relative;
 		.promotion-code-info {
-			width: 650rpx;
-			height: 1142rpx;
+			width: 548rpx;
+			height: 784rpx;
 			flex-shrink: 0;
 			box-sizing: border-box;
 			.canvas {

+ 12 - 5
pages/cash/index.vue

@@ -26,8 +26,9 @@
 						<view class="cash-content-cash-money">
 							<text class="cash-content-cash-money-icon">¥</text>
 							<view class="cash-content-cash-input">
-								<u--input :readonly="true" placeholder="请输入内容" border="none" clearable type="number" v-model="moneyValue"
-									@change="moneyAccountFun"></u--input>
+								<!-- <u--input :readonly="true" placeholder="请输入内容" border="none" clearable type="number" v-model="moneyValue"
+									@change="moneyAccountFun"></u--input> -->
+									<text>{{ moneyValue }}</text>
 							</view>
 
 							<!-- <text class="cash-content-cash-money-all" @click="cashAll()">全部提现</text> -->
@@ -482,8 +483,9 @@
 				padding: 34rpx 30rpx 38rpx;
 
 				>text {
-					font-size: 28rpx;
-					color: #363636;
+					font-size: 36rpx;
+					color: #222222;
+					font-weight: 600;
 				}
 
 				.cash-content-cash-money {
@@ -501,7 +503,9 @@
 						width: 100%;
 						padding: 0 10rpx;
 					}
-
+					.cash-content-cash-input text {
+						font-size: 60rpx !important;
+					}
 					>text {
 						flex-shrink: 0;
 						flex-wrap: nowrap;
@@ -533,6 +537,9 @@
 						color: #606060;
 						padding: 5rpx 0 10rpx;
 						font-size: 24rpx;
+						>text {
+							font-size: 28rpx;
+						}
 					}
 
 				}

+ 9 - 6
pages/distributor/index.vue

@@ -32,9 +32,9 @@
 					<view v-if="dataList.length>0" style="width: 100%;padding: 10rpx 30rpx 0;box-sizing: border-box;" class="item-list">
 						<u-checkbox-group placement="column" @change="checkboxChange">
 							<view v-for="(item,index) in dataList" :key="item.id" class="item u-flex">
-								<u-checkbox v-if="serialType==0" shape="circle" activeColor="#ED0000" :key="index"
+								<u-checkbox v-if="serialType==0||serialType==2" shape="circle" activeColor="#ED0000" :key="index"
 									:name="item.name" :checked="item.checked" @change="toggleCheck(index)" class="checkbox" />
-								<view :class="['item-box',serialType==0 ? 'item-box-shadow':'']">
+								<view :class="['item-box',serialType==0||serialType==2 ? 'item-box-shadow':'']">
 									<view class="text u-flex u-row-between text-order">
 										<view class="name">订单号:{{item.orderId}}</view>
 									</view>
@@ -50,11 +50,14 @@
 										<view class="withdrawTotal">获得佣金:<text class="num"> ¥ {{item.totalPrice}}</text></view>
 									</view>
 									<view v-if="serialType!=0" class="text u-flex u-row-between text-perform">
-										<view class="name">提现时间:{{ item.createTime }}</view>
+										<view class="name">提现时间:{{ item.applyTime }}</view>
 									</view>
 									<view v-if="serialType==1" class="text u-flex u-row-between text-perform">
 										<view class="name">到账时间:{{ item.receivedTime }}</view>
 									</view>
+									<view v-if="serialType==2" class="text u-flex u-row-between text-perform">
+										<view class="name">失败原因:{{ item.errReason }}</view>
+									</view>
 								</view>
 							</view>
 						</u-checkbox-group>
@@ -63,7 +66,7 @@
 			</view>
 			<!--  收支列表 结束  -->
 		</view>
-		<view class="cart-bottom" v-if="serialType==0">
+		<view class="cart-bottom" v-if="serialType==0||serialType==2">
 			<view class="inner u-flex u-row-between">
 				<view class="left u-flex">
 					<view class="checkbox" @click="checkboxClick" style="padding: 10px;">
@@ -79,8 +82,8 @@
 						</view>
 					</view>
 				</view>
-				<view class="btn active" v-if="selectGoods.length>0&&cansubmit" @click="submitorder">确定</view>
-				<view class="btn" v-else>确定</view>
+				<view class="btn active" v-if="selectGoods.length>0&&cansubmit" @click="submitorder">{{ serialType==2 ? "重新提交":"确定" }}</view>
+				<view class="btn" v-else>{{ serialType==2 ? "重新提交":"确定" }}</view>
 			</view>
 		</view>
 		<view class="cart-bottom" v-else-if="dataList.length>0">

+ 4 - 0
pages/login/index.vue

@@ -108,6 +108,8 @@
 		},
 		onShow() {
 			this.passwordType = 'password'
+			this.form.name =  uni.getStorageSync('userName') || '' // 清除缓存
+			this.form.password =  uni.getStorageSync('userPassword') || '' // 清除缓存
 		},
 		methods: {
 			/**
@@ -146,6 +148,8 @@
 						if(res.data && res.data.accessToken){
 							this.$u.vuex('distribution_user_info', res.data);
 							let backUrl = uni.getStorageSync('backUrlDistribution')
+							uni.setStorageSync('userName',this.form.name)
+							uni.setStorageSync('userPassword',this.form.password)
 							console.log("backUrl===",backUrl)
 							if(backUrl && backUrl != '/pages/login/index') {
 								uni.reLaunch({