Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_qianduan

pages/goods/detail.vue

@@ -530,6 +530,7 @@
 			}
 		},
 		onLoad(options) {
+			console.log(options)
 			const that = this;
 			that.options = options;
 			let result = uni.getStorageSync("addressResult")

pages/login/index.vue

@@ -1,65 +1,67 @@
 <template>
 	<view class="login">
 		<view class="refund-navbar">
-      <u-navbar
+			<u-navbar title="" :border-bottom="false" :background="background"></u-navbar>
-        title=""
-        :border-bottom="false"
-        :background="background"
-      ></u-navbar>
 		</view>
 		<view class="login-hd">
 			<view class="a">验证码登录</view>
 			<view class="b">若该手机号未注册，我们将自动为您注册</view>
 		</view>
 		<view class="login-bd">
-      <view class="a"
+			<view class="a">+86<input v-model="phoneNum" type="tel" placeholder="请输入手机号" /></view>
-        >+86<input v-model="phoneNum" type="tel" placeholder="请输入手机号"
-      /></view>
 			<view class="b">
 				<input v-model="semCode" placeholder="请输入验证码" />
 				<text @click="getCode" v-if="!showCountDown">获取验证码</text>
 				<text v-if="showCountDown">{{ countdown }}s</text>
 			</view>
 			<view class="c" style="display: flex; align-items: center">
-        <u-checkbox
+				<u-checkbox active-color="#FF343C" v-model="isCheckout" style="margin-right: -20rpx"></u-checkbox>
-          active-color="#FF343C"
+				同意<text @click="toTextPage(1)">《用户服务协议》</text>和<text @click="toTextPage(2)">《隐私政策》</text>
-          v-model="isCheckout"
-          style="margin-right: -20rpx"
-        ></u-checkbox
-        >同意<text @click="toTextPage(1)">《用户服务协议》</text>和<text
-          @click="toTextPage(2)"
-          >《隐私政策》</text
-        >
 			</view>
 		</view>
 		<view class="login-fd login-fd-on" @click="login">登录</view>
 		<view class="" v-if="isCheckout">
 			<mpWeiXinMobile :refereeId="refereeId"></mpWeiXinMobile>
 		</view>
-    <view
+		<view class="" v-else style="
-      class=""
-      v-else
-      style="
         font-size: 28rpx;
         color: #666;
         text-align: center;
         margin-top: 50rpx;
-      "
+      " @click="login">
-      @click="login"
-    >
 			手机号快捷登录
 		</view>
 	</view>
+	<view class="login-box" style="display: none;">
+		<view class="refund-navbar">
+			<u-navbar title="" :border-bottom="false" background="rgba(255, 233, 240, 1)"></u-navbar>
+		</view>
+		<view class="login-logo">
+			<image src="../../static/login_logo.png" mode=""></image>
+		</view>
+		<view class="login-name">
+			京苏云商
+		</view>
+		<view class="c">
+			<u-checkbox active-color="#FF343C" v-model="isCheckout" style="margin-right: -20rpx"></u-checkbox>
+			同意<text @click="toTextPage(1)">《用户服务协议》</text>和<text @click="toTextPage(2)">《隐私政策》</text>
+		</view>
+		<view class="fd fd-on" @click="login">登录</view>
+	</view>
 </template>
 
 <script>
-import * as UserApi from "@/api/user";
+	import * as UserApi from "@/api/user";
-import * as CaptchaApi from "@/api/captcha";
+	import * as CaptchaApi from "@/api/captcha";
-import mpWeiXinMobile from "./components/mp-weixin-mobile.vue";
+	import mpWeiXinMobile from "./components/mp-weixin-mobile.vue";
-import store from "@/store";
+	import store from "@/store";
-import { isEmpty } from "@/utils/util";
+	import {
-import { getSceneData } from '@/core/app'
+		isEmpty
-export default {
+	} from "@/utils/util";
+	import {
+		getSceneData
+	} from '@/core/app'
+	export default {
 		components: {
 			mpWeiXinMobile,
 		},
@@ -84,12 +86,12 @@ export default {
 			// 获取二维码场景值
 			const scene = getSceneData(o)
 			// 记录推荐人ID
-	const refereeId = scene.refereeId ? scene.refereeId : (scene.uid?scene.uid:o.refereeId)
+			const refereeId = scene.refereeId ? scene.refereeId : (scene.uid ? scene.uid : o.refereeId)
 			this.refereeId = refereeId;
 			console.log(scene)
 			console.log(o)
 			console.log(scene.refereeId)
-	console.log("refereeId",refereeId)
+			console.log("refereeId", refereeId)
 			console.log(this.refereeId)
 		},
 		methods: {
@@ -137,12 +139,12 @@ export default {
 							}
 						}, 1000);
 						uni.showToast({
-			  icon:"none",
+							icon: "none",
 							title: res.message,
 						});
 					} else {
 						uni.showToast({
-			    icon:"none",
+							icon: "none",
 							title: res.message,
 						});
 					}
@@ -165,7 +167,7 @@ export default {
 				}
 				uni.login({
 					provider: "weixin",
-        success: function (res) {
+					success: function(res) {
 						store
 							.dispatch("Login", {
 								smsCode: that.semCode,
@@ -182,7 +184,7 @@ export default {
 								setTimeout(() => that.onNavigateBack(1), 2000);
 							});
 					},
-		fail:function(){
+					fail: function() {
 						store
 							.dispatch("Login", {
 								smsCode: that.semCode,
@@ -218,14 +220,81 @@ export default {
 				}
 			},
 		},
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.login {
+	.login-box {
+		width: 100%;
+		background: linear-gradient(180deg, rgba(255, 233, 240, 1) 0%, rgba(226, 244, 243, 0) 35%);
+		min-height: 100vh;
+
+		.login-logo {
+			margin: 365rpx auto 0 auto;
+			width: 132rpx;
+			height: 132rpx;
+			border-radius: 24rpx;
+			background: rgba(243, 74, 64, 1);
+			box-shadow: -4rpx -8rpx 20rpx rgba(243, 74, 64, 0.16);
+
+			image {
+				width: 75rpx;
+				height: 85rpx;
+				margin: 23.5rpx 0 0 28.5rpx;
+			}
+		}
+
+		.login-name {
+			width: 100%;
+			text-align: center;
+
+			font-weight: bold;
+			font-size: 36rpx;
+			color: rgba(243, 74, 64, 1);
+			margin-top: 22rpx;
+		}
+
+		.c {
+			justify-content: center;
+			padding: 28rpx 0;
+			font-size: 26rpx;
+			font-weight: 400;
+			color: #a0a0a0;
+			display: flex;
+			align-items: center;
+
+			text {
+				color: #ff343c;
+			}
+
+			::v-deep .u-checkbox__icon-wrap--square {
+				border-radius: 50% !important;
+				width: 17px !important;
+				height: 17px !important;
+			}
+		}
+
+		.fd {
+			width: 680rpx;
+			line-height: 88rpx;
+			background: rgba(243, 74, 64, 1);
+			border-radius: 88rpx;
+			text-align: center;
+			margin: 0 auto;
+			margin-top: 50rpx;
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #ffffff;
+
+			.fd-on {
+				background-color: rgba(243, 74, 64, 1);
+			}
+		}
+	}
+
+	.login {
 		width: 100%;
-  background: #fffafb url(https://www.royaum.com.cn/static/news/login-bg.png)
+		background: #fffafb url(https://www.royaum.com.cn/static/news/login-bg.png) center top no-repeat;
-    center top no-repeat;
 		background-size: 100% auto;
 		min-height: 100vh;
 
@@ -318,5 +387,5 @@ export default {
 				background-color: #ff343c;
 			}
 		}
-}
+	}
 </style>

pages/news/consult/about.vue

@@ -13,7 +13,9 @@
 			<view class="b">{{cityInfo.phone}}<image :src="$picUrl+'/static/news/tel.png'" @click="callPhone()"></image></view>
 		</view>
 		<view class="park-fd">
-			<image :src="cityInfo.wechat" show-menu-by-longpress='1'></image>
+				<!-- <image :src="cityInfo.wechat" show-menu-by-longpress='1'></image> -->
+			<!--  -->
+			<image mode="widthFix" :src="cityInfo.wechat"></image>
 			<view class="txt">长按识别二维码</view>
 			<view class="txt">添加我的微信</view>
 		</view>
@@ -141,15 +143,16 @@
 		text-align: center;
 		image{
 			width: 300rpx;
-			height: 300rpx;
+			// height: 300rpx;
 			display: block;
 			margin: 0 auto;
+			max-height:400rpx ;
 		}
 		.txt{
 			font-size: 32rpx;
 			font-weight: 400;
 			color: #686868;
-			margin-top: 20rpx;
+			margin-top: 30rpx;
 		}
 	}
 	&-btn{

pages/news1/jinqun.vue

@@ -2,6 +2,7 @@
 	<view class="jinqun" :style="{background:`url(${$picUrl}/static/jinqun-bg1.png)`}"
 		style="background-size: 100% 100%;text-align: center;">
 		<view class="image-box">
+			<!-- mode="heightFix" -->
 			<image :src="cityInfo.group_share_img" class="image" bindtap="clickImg"></image>
 		</view>
 	</view>
@@ -56,25 +57,32 @@
 		}
 	}
 </script>
-
+<style>
+	page {
+		width: 100% !important;
+		height: 100%;
+		background-color: #E2b257;
+	}
+</style>
 <style lang="scss" scoped>
 	.jinqun {
 		.image-box {
-			width: 330rpx;
+			overflow: hidden;
-			height: 330rpx;
+			width: 335rpx;
-			margin: 420rpx auto;
+			height: 335rpx;
-
+			margin: 485rpx auto 0 auto;
 			.image {
 				width: 100%;
 				height: 100%;
 			}
 		}
+
 		overflow: hidden;
 		height:100%;
-		position: relative;
+		// position: relative;
 		background-repeat: no-repeat;
 		background-size: cover;
-		min-height: 100vh;
+		height: 1325rpx;
 
 		.flag {
 			position: absolute;

pages/order/detail.vue

@@ -266,11 +266,11 @@
 		<view v-if="menushow" class="menuarea">
 			<view class="menulist">
 				<view class="" @click="onInvoicing(order.order_id,order)"
-					v-if="order.order_status == OrderStatusEnum.COMPLETED.value&&item.pay_status == PayStatusEnum.SUCCESS.value">
+					v-if="order.order_status == OrderStatusEnum.COMPLETED.value&&order.pay_status == PayStatusEnum.SUCCESS.value">
 					申请开票
 				</view>
 				<view class="" @click="onDelete(order.order_id)"
-					v-if="order.order_status == OrderStatusEnum.COMPLETED.value&&item.pay_status == PayStatusEnum.SUCCESS.value">
+					v-if="order.order_status == OrderStatusEnum.COMPLETED.value&&order.pay_status == PayStatusEnum.SUCCESS.value">
 					删除订单
 				</view>
 				<view class=""
@@ -283,7 +283,7 @@
 		</view>
 		<view class="footer">
 			<view class="meetPrice" @click="changeMenu"
-				v-if="(order.order_status == OrderStatusEnum.COMPLETED.value&&item.pay_status == PayStatusEnum.SUCCESS.value) || (order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value&&order.order_status == OrderStatusEnum.NORMAL.value)">
+				v-if="(order.order_status == OrderStatusEnum.COMPLETED.value&&order.pay_status == PayStatusEnum.SUCCESS.value) || (order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value&&order.order_status == OrderStatusEnum.NORMAL.value)">
 				更多
 			</view>
 			<view v-else style="color: #fff;">-</view>