From bb12efb2781f643034aa232b05e7736e7607074f Mon Sep 17 00:00:00 2001
From: TianYu <332368756@qq.com>
Date: Tue, 23 May 2023 09:47:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/src/settings.js                |  10 +
 .../src/views/system/tenant/index.vue         |   4 +-
 yudao-ui-app/components/countDown/index.vue   |  74 +-
 yudao-ui-app/components/numberScroll.vue      | 160 ++++
 .../components/paymentMember/index.vue        |  47 +-
 yudao-ui-app/config/app.js                    |  10 +-
 yudao-ui-app/pages.json                       |   6 +
 yudao-ui-app/pages/goods_cashier/index.vue    | 752 ++++++++++++++++++
 yudao-ui-app/pages/users/login/index.vue      |   6 +-
 yudao-ui-app/pages/users/register/index.vue   |   2 +-
 .../pages/users/retrievePassword/index.vue    |   2 +-
 .../pages/users/user_spread_code/index.vue    |   5 +-
 12 files changed, 988 insertions(+), 90 deletions(-)
 create mode 100644 yudao-ui-app/components/numberScroll.vue
 create mode 100644 yudao-ui-app/pages/goods_cashier/index.vue

diff --git a/yudao-ui-admin/src/settings.js b/yudao-ui-admin/src/settings.js
index 045f5eb3f..c3be16571 100644
--- a/yudao-ui-admin/src/settings.js
+++ b/yudao-ui-admin/src/settings.js
@@ -1,5 +1,15 @@
 module.exports = {
 
+  /**
+   * 推广链接域名
+   */
+  spreadDomain: 'http://h5.cyywl.top',
+
+  /**
+   * 推广码生成访问H5链接地址
+   */
+  spreadLink: '/pages/member_application/index',
+
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
    */
diff --git a/yudao-ui-admin/src/views/system/tenant/index.vue b/yudao-ui-admin/src/views/system/tenant/index.vue
index 9acf6e86e..d026fa14b 100755
--- a/yudao-ui-admin/src/views/system/tenant/index.vue
+++ b/yudao-ui-admin/src/views/system/tenant/index.vue
@@ -204,6 +204,7 @@ import {
   getTenantPage,
   exportTenantExcel
 } from '@/api/system/tenant';
+import config from '@/settings'
 import QRCode from 'qrcode'
 import {CommonStatusEnum} from '@/utils/constants'
 import {getTenantPackageList} from '@/api/system/tenantPackage';
@@ -345,8 +346,7 @@ export default {
       this.resetForm('form');
     },
     handleQRCode(row) {
-      const baseUrl = 'http://yuxy.perrymake.com'
-      const url =`${baseUrl}/pages/member_application/index?redirectUrl=${baseUrl}&tenantId=${row.id}`
+      const url =`${config.spreadDomain}${config.spreadLink}?redirectUrl=${config.spreadDomain}&tenantId=${row.id}`
       QRCode.toCanvas(document.getElementById(`id-${row.id}`), url, {
         scale: 2
       }, function (error) {
diff --git a/yudao-ui-app/components/countDown/index.vue b/yudao-ui-app/components/countDown/index.vue
index 291c6e6e5..b0e6e12c2 100644
--- a/yudao-ui-app/components/countDown/index.vue
+++ b/yudao-ui-app/components/countDown/index.vue
@@ -1,14 +1,14 @@
 <template>
 	<view class="time" :style="justifyLeft">
-		<text class="" v-if="tipText">{{ tipText }}</text>
-		<text class="styleAll p6" v-if="isDay === true" :style="{background:bgColor.bgColor,color:bgColor.Color}">{{ day }}{{bgColor.isDay?'天':''}}</text>
-		<text class="timeTxt" v-if="dayText" :style="{width:bgColor.timeTxtwidth,color:bgColor.bgColor}">{{ dayText }}</text>
-		<text class="styleAll" :class='isCol?"timeCol":""' :style="{background:bgColor.bgColor,color:bgColor.Color,width:bgColor.width}">{{ hour }}</text>
-		<text class="timeTxt" v-if="hourText" :class='isCol?"whit":""' :style="{width:bgColor.timeTxtwidth,color:bgColor.bgColor}">{{ hourText }}</text>
-		<text class="styleAll" :class='isCol?"timeCol":""' :style="{background:bgColor.bgColor,color:bgColor.Color,width:bgColor.width}">{{ minute }}</text>
-		<text class="timeTxt" v-if="minuteText" :class='isCol?"whit":""' :style="{width:bgColor.timeTxtwidth,color:bgColor.bgColor}">{{ minuteText }}</text>
-		<text class="styleAll" :class='isCol?"timeCol":""' :style="{background:bgColor.bgColor,color:bgColor.Color,width:bgColor.width}">{{ second }}</text>
-		<text class="timeTxt" v-if="secondText">{{ secondText }}</text>
+		<text class="red" v-if="tipText">{{ tipText }}</text>
+		<text class="styleAll" :style="'background-color:'+ bgColor +';color:'+ colors +';'" v-if="isDay === true">{{ day }}</text>
+		<text class="timeTxt red" v-if="dayText">{{ dayText }}</text>
+		<text class="styleAll" :style="'background-color:'+ bgColor +';color:'+ colors +';'">{{ hour }}</text>
+		<text class="timeTxt red" v-if="hourText">{{ hourText }}</text>
+		<text class="styleAll" :style="'background-color:'+ bgColor +';color:'+ colors +';'">{{ minute }}</text>
+		<text class="timeTxt red" v-if="minuteText">{{ minuteText }}</text>
+		<text class="styleAll" :style="'background-color:'+ bgColor +';color:'+ colors +';'">{{ second }}</text>
+		<text class="timeTxt red" v-if="secondText">{{ secondText }}</text>
 	</view>
 </template>
 
@@ -49,13 +49,13 @@
 				type: Boolean,
 				default: true
 			},
-			isCol: {
-				type: Boolean,
-				default: false
+			bgColor:{
+				type: String,
+				default: ""
 			},
-			bgColor: {
-				type: Object,
-				default: null
+			colors:{
+				type: String,
+				default: ""
 			}
 		},
 		data: function() {
@@ -116,47 +116,13 @@
 	};
 </script>
 
-<style scoped>
-	.p6{
-		padding: 0 8rpx;
-	}
-	.styleAll{
-		/* color: #fff; */
-		font-size: 24rpx;
-		height: 36rpx;
-		line-height: 36rpx;
-		border-radius: 6rpx;
-		text-align: center;
-		/* padding: 0 6rpx; */
-	}
-	.timeTxt{
-		    text-align: center;
-		    /* width: 16rpx; */
-		    height: 36rpx;
-		    line-height: 36rpx;
-		    display: inline-block;
-	}
-	.whit{
-		color: #fff !important;
-	}
-	.time {
+<style>
+	.time{
 		display: flex;
 		justify-content: center;
-	}
-
-	.red {
-		color: #fc4141;
+	} 
+	.red{
+		color: var(--view-theme);
 		margin: 0 4rpx;
 	}
-
-	.timeCol {
-		/* width: 40rpx;
-		height: 40rpx;
-		line-height: 40rpx;
-		text-align:center;
-		border-radius: 6px;
-		background: #fff;
-		font-size: 24rpx; */
-		color: #E93323;
-	}
 </style>
diff --git a/yudao-ui-app/components/numberScroll.vue b/yudao-ui-app/components/numberScroll.vue
new file mode 100644
index 000000000..2ace75d54
--- /dev/null
+++ b/yudao-ui-app/components/numberScroll.vue
@@ -0,0 +1,160 @@
+<template>
+	<view class="number-box">
+		<block v-for="(myIndex, index) in indexArr" :key="index">
+			<swiper class="swiper" vertical="true" :current="myIndex" circular="true"
+				v-bind:style="{color:color,width:myIndex == 10  ? '14rpx' : myIndex == 1 ? '22rpx' : width+'rpx',height:height+'rpx',lineHeight:fontSize+'rpx',fontSize:fontSize+'rpx',fontWeight: fontWeight}">
+				<swiper-item>
+					<view class="swiper-item">0</view>
+				</swiper-item>
+				<swiper-item>
+					<view class="swiper-item">1</view>
+				</swiper-item>
+				<swiper-item>
+					<view class="swiper-item">2</view>
+				</swiper-item>
+				<swiper-item>
+					<view class="swiper-item">3</view>
+				</swiper-item>
+				<swiper-item>
+					<view class="swiper-item">4</view>
+				</swiper-item>
+				<swiper-item>
+					<view class="swiper-item">5</view>
+				</swiper-item>
+				<swiper-item>
+					<view class="swiper-item">6</view>
+				</swiper-item>
+				<swiper-item>
+					<view class="swiper-item">7</view>
+				</swiper-item>
+				<swiper-item>
+					<view class="swiper-item">8</view>
+				</swiper-item>
+				<swiper-item>
+					<view class="swiper-item">9</view>
+				</swiper-item>
+				<swiper-item>
+					<view class="swiper-item">.</view>
+				</swiper-item>
+			</swiper>
+		</block>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			num: [String, Number],
+			color: {
+				type: String,
+				default: '#000000'
+			},
+			width: {
+				type: String,
+				default: '30'
+			},
+			height: {
+				type: String,
+				default: '30'
+			},
+			fontSize: {
+				type: String,
+				default: '30'
+			},
+			fontWeight: {
+				type: [String, Number],
+				default: 500
+			}
+		},
+		data() {
+			return {
+				indexArr: []
+			};
+		},
+		created() {
+			let {
+				num
+			} = this;
+			let arr = new Array(num.toString().length);
+			arr.fill(0);
+			this.indexArr = arr;
+		},
+		watch: {
+			num: function(val, oldVal) {
+				// 处理新老数据长度不一样的情况
+				let arr = Array.prototype.slice.apply(this.indexArr);
+				let newLen = val.toString().length;
+				let oldLen = oldVal.toString().length;
+				if (newLen > oldLen) {
+					for (let i = 0; i < newLen - oldLen; i++) {
+						arr.push(0);
+					}
+					this.indexArr = arr;
+				}
+				if (newLen < oldLen) {
+					for (let i = 0; i < oldLen - newLen; i++) {
+						arr.pop();
+					}
+					this.indexArr = arr;
+				}
+				this.numChange(val);
+			}
+		},
+		mounted() {
+			//定时器作用：app显示数字滚动
+			this._time = setTimeout(() => {
+				this.numChange(this.num);
+				clearTimeout(this._time);
+			}, 50);
+		},
+		methods: {
+			/**
+			 * 数字改变
+			 * @value 数字
+			 */
+			numChange(num) {
+				this.$nextTick(() => {
+					let {
+						indexArr
+					} = this;
+					let copyIndexArr = Array.prototype.slice.apply(indexArr);
+					let _num = num.toString();
+					for (let i = 0; i < _num.length; i++) {
+						if (_num[i] === '.') {
+							copyIndexArr[i] = 10;
+						} else {
+							copyIndexArr[i] = Number(_num[i]);
+						}
+					}
+					this.indexArr = copyIndexArr;
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.number-box {
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: center;
+	}
+
+	.swiper {
+		position: relative;
+		// 	line-height: 30upx;
+		// 	width: 30upx;
+		// 	height: 30upx;
+		// 	font-size: 30upx;
+		// 	background: red;
+	}
+
+	.swiper:after {
+		content: '';
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+	}
+</style>
diff --git a/yudao-ui-app/components/paymentMember/index.vue b/yudao-ui-app/components/paymentMember/index.vue
index f44fa2875..fe28f204d 100644
--- a/yudao-ui-app/components/paymentMember/index.vue
+++ b/yudao-ui-app/components/paymentMember/index.vue
@@ -22,7 +22,8 @@
     <view class="mask" @click='close' v-if="pay_close"></view>
     <!-- 支付宝支付界面 -->
     <u-modal :show="alipayShow" title="支付宝支付" @confirm="handleConfirm">
-     <view class="slot-content">
+      <button style="display:none;" class="btn" data-clipboard-text="Just because you can doesn't mean you should — clipboard.js"></button>
+      <view class="slot-content">
         <rich-text :nodes="alipayForm"></rich-text>
       </view>
     </u-modal>
@@ -65,35 +66,35 @@
     data() {
       return {
         alipayShow: false,
-        alipayForm:`链接已复制，请到外部浏览器完成支付`
+        alipayForm: `链接已复制，请到外部浏览器完成支付`
       };
     },
     computed: mapGetters(['systemPlatform', 'openId']),
     methods: {
-      handleConfirm(){
+      handleConfirm() {
         this.alipayShow = false
         window.location.reload()
       },
       // 复制操作
-              _copy(context) {
-                  // 创建输入框元素
-                  let oInput = document.createElement('input');
-                  // 将想要复制的值
-                  oInput.value = context;
-                  // 页面底部追加输入框
-                  document.body.appendChild(oInput);
-                  // 选中输入框
-                  oInput.select();
-                  // 执行浏览器复制命令
-                  document.execCommand('Copy');
-                  // 弹出复制成功信息
-                  this.$util.Tips({
-                  	title: '复制链接成功'
-                  })
-                  this.alipayShow = true
-                  // 复制后移除输入框
-                  oInput.remove();
-              },
+      _copy(context) {
+        // 创建输入框元素
+        let oInput = document.createElement('input');
+        // 将想要复制的值
+        oInput.value = context;
+        // 页面底部追加输入框
+        document.body.appendChild(oInput);
+        // 选中输入框
+        oInput.select();
+        // 执行浏览器复制命令
+        document.execCommand('Copy');
+        // 弹出复制成功信息
+        this.$util.Tips({
+          title: '复制链接成功'
+        })
+        this.alipayShow = true
+        // 复制后移除输入框
+        oInput.remove();
+      },
       close: function() {
         this.$emit('onChangeFun', {
           action: 'payClose'
@@ -139,7 +140,7 @@
           title: '支付中',
           mask: true
         });
-        if(paytype === 'WXPAY' && !that.openId) {
+        if (paytype === 'WXPAY' && !that.openId) {
           return that.$util.Tips({
             title: '请在微信客户端进行支付操作'
           });
diff --git a/yudao-ui-app/config/app.js b/yudao-ui-app/config/app.js
index d42b88408..4c65e8dab 100644
--- a/yudao-ui-app/config/app.js
+++ b/yudao-ui-app/config/app.js
@@ -1,12 +1,12 @@
 
-let domain = 'http://yuxy.perrymake.com'
+let domain = 'http://api.cyywl.top'
 
 module.exports = {
 	// 请求域名 格式： https://您的域名
 	// #ifdef MP
 		HTTP_REQUEST_URL: domain,
 	// #endif
-	HTTP_ADMIN_URL:'http://yuxy.perrymake.com', //PC后台的API请求地址，上传图片用
+	HTTP_ADMIN_URL:'http://api.cyywl.top', //PC后台的API请求地址，上传图片用
 	// #ifdef H5
 		//H5接口是浏览器地址
 		// HTTP_REQUEST_URL: window.location.protocol+"//"+window.location.host,
@@ -25,5 +25,9 @@ module.exports = {
 	// 缓存时间 0 永久
 	EXPIRE:0,
 	//分页最多显示条数
-	LIMIT: 10
+	LIMIT: 10,
+  // 推广链接域名 
+  SPREAD_DOMAIN: 'http://h5.cyywl.top',
+  // 推广码生成访问H5链接地址 
+  SPREAD_LINK: '/pages/member_application/index',
 };
diff --git a/yudao-ui-app/pages.json b/yudao-ui-app/pages.json
index 73cc78bfb..f85e987c1 100644
--- a/yudao-ui-app/pages.json
+++ b/yudao-ui-app/pages.json
@@ -46,6 +46,12 @@
 				"navigationBarTitleText": "购物车"
 			}
 		},
+    {
+    	"path": "pages/goods_cashier/index",
+    	"style": {
+    		"navigationBarTitleText": "收银台"
+    	}
+    },
 		{
 			"path": "pages/user/index",
 			"style": {
diff --git a/yudao-ui-app/pages/goods_cashier/index.vue b/yudao-ui-app/pages/goods_cashier/index.vue
new file mode 100644
index 000000000..cc6cc9ab1
--- /dev/null
+++ b/yudao-ui-app/pages/goods_cashier/index.vue
@@ -0,0 +1,752 @@
+<template>
+	<view class="page" v-if="payPriceShow">
+		<view class="pay-price">
+			<view class="price">
+				<text class="unit">￥</text>
+				<numberScroll :num='payPriceShow' color="#E93323" width='30' height='50' fontSize='50'></numberScroll>
+			</view>
+			<view class="count-down">
+				支付剩余时间：
+				<countDown :is-day="false" :tip-text="' '" :day-text="' '" :hour-text="' : '" :minute-text="' : '"
+					:second-text="' '" :datatime="invalidTime"></countDown>
+			</view>
+		</view>
+		<view class="payment">
+			<view class="title">
+				请选择支付方式
+			</view>
+			<view class="item acea-row row-between-wrapper" v-for="(item,index) in cartArr" :key="index"
+				v-show='item.payStatus' @click="payType(item.number || 0, item.value, index)">
+				<view class="left acea-row row-between-wrapper">
+					<view class="iconfont" :class="item.icon"></view>
+					<view class="text">
+						<view class="name">{{item.name}}</view>
+						<view class="info" v-if="item.value == 'yue'">
+							{{item.title}} <span class="money">￥{{ item.number }}</span>
+						</view>
+						<view class="info" v-else>{{item.title}}</view>
+					</view>
+				</view>
+				<view class="iconfont" :class="active==index?'icon-xuanzhong11 font-num':'icon-weixuan'"></view>
+			</view>
+		</view>
+		<view class="btn">
+			<view class="button acea-row row-center-wrapper" @click='goPay(number, paytype)'>确认支付</view>
+			<view class="wait-pay" @click="waitPay">暂不支付</view>
+		</view>
+		<view v-show="false" v-html="formContent"></view>
+	</view>
+	</view>
+</template>
+
+<script>
+	import countDown from '@/components/countDown';
+	import numberScroll from '@/components/numberScroll.vue'
+	import {
+		getCashierOrder,
+		orderPay
+	} from '@/api/order.js';
+	export default {
+		components: {
+			countDown,
+			numberScroll
+		},
+		data() {
+			return {
+				checked: false,
+				datatime: 1676344056,
+				//支付方式
+				cartArr: [{
+						"name": '微信支付',
+						"icon": "icon-weixin2",
+						value: 'weixin',
+						title: '使用微信快捷支付',
+						payStatus: 1,
+					},
+					{
+						"name": '支付宝支付',
+						"icon": "icon-zhifubao",
+						value: 'alipay',
+						title: '使用支付宝支付',
+						payStatus: 1,
+					}
+				],
+				orderId: 0,
+				fromType: '',
+				active: 0,
+				payPrice: 10,
+				payPriceShow: 10,
+				payPostage: 0,
+				offlinePostage: false,
+				invalidTime: 1684748596,
+				initIn: false,
+				jumpData: {
+					orderId: '',
+					msg: ''
+				},
+				formContent: ''
+			}
+		},
+		watch: {
+			cartArr: {
+				handler(newV, oldValue) {
+					let newPayList = [];
+					newV.forEach((item, index) => {
+						if (item.payStatus) {
+							item.index = index;
+							newPayList.push(item)
+						}
+					});
+					this.active = newPayList[0].index;
+					this.paytype = newPayList[0].value;
+					this.number = newPayList[0].number || 0;
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+		onLoad(options) {
+			if (options.order_id) this.orderId = options.order_id
+			if (options.from_type) this.fromType = options.from_type
+			// this.getCashierOrder()
+		},
+		onShow() {
+			let options = wx.getEnterOptionsSync();
+			console.log(options)
+			if (options.scene == '1038' && options.referrerInfo.appId == 'wxef277996acc166c3' && this.initIn) {
+				// 代表从收银台小程序返回
+				let extraData = options.referrerInfo.extraData;
+				this.initIn = false
+				if (!extraData) {
+					// "当前通过物理按键返回，未接收到返参，建议自行查询交易结果";
+					this.$util.Tips({
+						title: `取消支付`
+					}, {
+						tab: 5,
+						url: `/pages/goods/order_pay_status/index?order_id=${this.orderId}&msg=取消支付&type=3&totalPrice=${this.payPriceShow}&status=2`
+					});
+				} else {
+					if (extraData.code == 'success') {
+						this.$util.Tips({
+							title: `支付成功`,
+							icon: 'success'
+						}, {
+							tab: 5,
+							url: `/pages/goods/order_pay_status/index?order_id=${this.orderId}&msg=${this.jumpData.msg}&type=3&totalPrice=${this.payPriceShow}`
+						});
+					} else if (extraData.code == 'cancel') {
+						// "支付已取消";
+						this.$util.Tips({
+							title: `取消支付`
+						}, {
+							tab: 5,
+							url: `/pages/goods/order_pay_status/index?order_id=${this.orderId}&msg=取消支付&type=3&totalPrice=${this.payPriceShow}&status=2`
+						});
+					} else {
+						// "支付失败：" + extraData.errmsg;
+						uni.reLaunch({
+							url: `/pages/goods/order_pay_status/index?order_id=${this.orderId}&msg=支付失败&totalPrice=${this.payPriceShow}`
+						})
+					}
+				}
+			}
+		},
+		methods: {
+			getCashierOrder() {
+				uni.showLoading({
+					title: '创建订单中'
+				});
+				getCashierOrder(this.orderId, this.fromType).then(res => {
+					console.log(res)
+					this.payPrice = this.payPriceShow = res.data.pay_price
+					this.payPostage = res.data.pay_postage
+					this.offlinePostage = res.data.offline_postage
+					this.invalidTime = res.data.invalid_time
+					//微信支付是否开启
+					this.cartArr[0].payStatus = res.data.wechat_pay_status || 0
+					//支付宝是否开启
+					this.cartArr[1].payStatus = res.data.ali_pay_status || 0;
+					//#ifdef MP
+					this.cartArr[1].payStatus = false;
+					//#endif
+					//余额支付是否开启
+					// that.cartArr[2].title = '可用余额:' + res.data.userInfo.now_money;
+					this.cartArr[2].number = res.data.now_money;
+					this.cartArr[2].payStatus = res.data.yue_pay_status
+					if (res.data.offline_pay_status) {
+						this.cartArr[3].payStatus = 1
+					} else {
+						this.cartArr[3].payStatus = 0
+					}
+					//好友代付是否开启
+					this.cartArr[4].payStatus = res.data.friend_pay_status || 0;
+					uni.hideLoading();
+				}).catch(err => {
+					uni.hideLoading();
+					return this.$util.Tips({
+						title: err
+					})
+				})
+			},
+			payType(number, paytype, index) {
+				this.active = index;
+				this.paytype = paytype;
+				this.number = number;
+				if (this.offlinePostage) {
+					if (paytype == 'offline') {
+						this.payPriceShow = this.$util.$h.Sub(this.payPrice, this.payPostage);
+					} else {
+						this.payPriceShow = this.payPrice;
+					}
+
+				}
+			},
+			formpost(url, postData) {
+				let tempform = document.createElement("form");
+				tempform.action = url;
+				tempform.method = "post";
+				tempform.target = "_self";
+				tempform.style.display = "none";
+				for (let x in postData) {
+					let opt = document.createElement("input");
+					opt.name = x;
+					opt.value = postData[x];
+					tempform.appendChild(opt);
+				}
+				document.body.appendChild(tempform);
+				this.$nextTick(e => {
+					tempform.submit();
+				})
+			},
+			waitPay() {
+				uni.reLaunch({
+					url: '/pages/goods/order_pay_status/index?order_id=' + this.orderId + '&msg=取消支付&type=3' +
+						'&status=2&totalPrice=' + this.payPriceShow
+				})
+			},
+			goPay(number, paytype) {
+				let that = this;
+				if (!that.orderId) return that.$util.Tips({
+					title: '请选择要支付的订单'
+				});
+				if (paytype == 'yue' && parseFloat(number) < parseFloat(that.payPriceShow)) return that.$util.Tips({
+					title: `余额不足`
+				});
+				uni.showLoading({
+					title: `支付中`
+				});
+				if (paytype == 'friend' && that.orderId) {
+					uni.hideLoading();
+					return uni.navigateTo({
+						url: '/pages/users/payment_on_behalf/index?order_id=' + that.orderId + '&spread=' +
+							this.$store.state.app.uid,
+						success: res => {},
+						fail: () => {},
+						complete: () => {}
+					});
+				}
+				orderPay({
+					uni: that.orderId,
+					paytype: paytype,
+					type: that.friendPay ? 1 : 0,
+					// #ifdef H5
+					quitUrl: location.port ? location.protocol + '//' + location.hostname + ':' + location
+						.port +
+						'/pages/goods/order_details/index?order_id=' + this.orderId : location.protocol +
+						'//' + location.hostname +
+						'/pages/goods/order_details/index?order_id=' + this.orderId
+					// #endif
+					// #ifdef APP-PLUS
+					quitUrl: '/pages/goods/order_details/index?order_id=' + this.orderId
+					// #endif
+				}).then(res => {
+					let status = res.data.status,
+						orderId = res.data.result.orderId,
+						jsConfig = res.data.result.jsConfig,
+						goPages = '/pages/goods/order_pay_status/index?order_id=' + this.orderId + '&msg=' +
+						res
+						.msg +
+						'&type=3' + '&totalPrice=' + this.payPriceShow,
+						friendPay = '/pages/users/payment_on_behalf/index?order_id=' + this.orderId +
+						'&spread=' +
+						this
+						.$store.state.app.uid
+					switch (status) {
+						case 'ORDER_EXIST':
+						case 'EXTEND_ORDER':
+							uni.hideLoading();
+							return that.$util.Tips({
+								title: res.msg
+							}, {
+								tab: 5,
+								url: goPages
+							});
+						case 'ALLINPAY_PAY':
+							uni.hideLoading();
+							// #ifdef MP
+							this.initIn = true
+							wx.openEmbeddedMiniProgram({
+								appId: 'wxef277996acc166c3',
+								extraData: {
+									cusid: jsConfig.cusid,
+									appid: jsConfig.appid,
+									version: jsConfig.version,
+									trxamt: jsConfig.trxamt,
+									reqsn: jsConfig.reqsn,
+									notify_url: jsConfig.notify_url,
+									body: jsConfig.body,
+									remark: jsConfig.remark,
+									validtime: jsConfig.validtime,
+									randomstr: jsConfig.randomstr,
+									paytype: jsConfig.paytype,
+									sign: jsConfig.sign,
+									signtype: jsConfig.signtype
+								}
+							})
+							this.jumpData = {
+								orderId: res.data.result.orderId,
+								msg: res.msg,
+							}
+							// #endif
+							// #ifdef APP-PLUS
+							plus.runtime.openURL(jsConfig.payinfo);
+							setTimeout(e => {
+								uni.reLaunch({
+									url: goPages
+								})
+							}, 1000)
+							// #endif
+							// #ifdef H5
+							this.formpost(res.data.result.pay_url, jsConfig)
+							// #endif
+							break;
+						case 'PAY_ERROR':
+							uni.hideLoading();
+							return that.$util.Tips({
+								title: res.msg
+							}, {
+								tab: 5,
+								url: goPages
+							});
+							break;
+						case 'SUCCESS':
+							uni.hideLoading();
+							if (paytype !== 'friend') {
+								return that.$util.Tips({
+									title: res.msg,
+									icon: 'success'
+								}, {
+									tab: 4,
+									url: goPages
+								});
+							} else {
+								return that.$util.Tips({
+									title: res.msg,
+									icon: 'success'
+								}, {
+									tab: 4,
+									url: friendPay
+								});
+							}
+
+
+							break;
+						case 'WECHAT_PAY':
+							that.toPay = true;
+							// #ifdef MP
+							/* that.toPay = true; */
+							let mp_pay_name = ''
+							if (uni.requestOrderPayment) {
+								mp_pay_name = 'requestOrderPayment'
+							} else {
+								mp_pay_name = 'requestPayment'
+							}
+							uni[mp_pay_name]({
+								timeStamp: jsConfig.timestamp,
+								nonceStr: jsConfig.nonceStr,
+								package: jsConfig.package,
+								signType: jsConfig.signType,
+								paySign: jsConfig.paySign,
+								success: function(res) {
+									uni.hideLoading();
+									if (that.BargainId || that.combinationId || that.pinkId ||
+										that
+										.seckillId || that.discountId)
+										return that.$util.Tips({
+											title: `支付成功`,
+											icon: 'success'
+										}, {
+											tab: 4,
+											url: goPages
+										});
+									return that.$util.Tips({
+										title: `支付成功`,
+										icon: 'success'
+									}, {
+										tab: 5,
+										url: goPages
+									});
+								},
+								fail: function(e) {
+									uni.hideLoading();
+									return that.$util.Tips({
+										title: `取消支付`
+									}, {
+										tab: 5,
+										url: goPages + '&status=2'
+									});
+								},
+								complete: function(e) {
+									uni.hideLoading();
+									//关闭当前页面跳转至订单状态
+									if (res.errMsg == 'requestPayment:cancel' || e.errMsg ==
+										'requestOrderPayment:cancel') return that.$util
+										.Tips({
+											title: `取消支付`
+										}, {
+											tab: 5,
+											url: goPages + '&status=2'
+										});
+								},
+							})
+							// #endif
+							// #ifdef H5
+							this.$wechat.pay(res.data.result.jsConfig).then(res => {
+								return that.$util.Tips({
+									title: `支付成功`,
+									icon: 'success'
+								}, {
+									tab: 5,
+									url: goPages
+								});
+							}).catch(res => {
+								if (!this.$wechat.isWeixin()) {
+									uni.redirectTo({
+										url: goPages + '&msg=' + `支付失败` +
+											'&status=2'
+										// '&msg=支付失败&status=2'
+									})
+								}
+								if (res.errMsg == 'chooseWXPay:cancel') return that.$util.Tips({
+									title: `取消支付`
+								}, {
+									tab: 5,
+									url: goPages + '&status=2'
+								});
+							})
+							// #endif
+							// #ifdef APP-PLUS
+							uni.requestPayment({
+								provider: 'wxpay',
+								orderInfo: jsConfig,
+								success: (e) => {
+									let url = goPages;
+									uni.showToast({
+										title: `支付成功`
+									})
+									setTimeout(res => {
+										uni.redirectTo({
+											url: url
+										})
+									}, 2000)
+								},
+								fail: (e) => {
+									let url = '/pages/goods/order_pay_status/index?order_id=' +
+										orderId +
+										'&msg=' + `支付失败`;
+									uni.showModal({
+										content: `支付失败`,
+										showCancel: false,
+										success: function(res) {
+											if (res.confirm) {
+												uni.redirectTo({
+													url: url
+												})
+											} else if (res.cancel) {}
+										}
+									})
+								},
+								complete: () => {
+									uni.hideLoading();
+								},
+							});
+							// #endif
+							break;
+						case 'PAY_DEFICIENCY':
+							uni.hideLoading();
+							//余额不足
+							return that.$util.Tips({
+								title: res.msg
+							}, {
+								tab: 5,
+								url: goPages + '&status=1'
+							});
+							break;
+
+						case "WECHAT_H5_PAY":
+							uni.hideLoading();
+							that.$util.Tips({
+								title: `等待支付中`
+							}, {
+								tab: 4,
+								url: goPages + '&status=0'
+							});
+							setTimeout(() => {
+								location.href = res.data.result.jsConfig.h5_url;
+							}, 1500);
+							break;
+
+						case 'ALIPAY_PAY':
+							//#ifdef H5
+							uni.hideLoading();
+							that.$util.Tips({
+								title: `等待支付中`
+							}, {
+								tab: 4,
+								url: goPages + '&status=0'
+							});
+							that.formContent = res.data.result.jsConfig;
+							setTimeout(() => {
+								document.getElementById('alipaysubmit').submit();
+							}, 1500);
+							//#endif
+							// #ifdef MP
+							uni.navigateTo({
+								url: `/pages/users/alipay_invoke/index?id=${orderId}&link=${jsConfig.qrCode}`
+							});
+							// #endif
+							// #ifdef APP-PLUS
+							uni.requestPayment({
+								provider: 'alipay',
+								orderInfo: jsConfig,
+								success: (e) => {
+									uni.showToast({
+										title: `支付成功`
+									})
+									let url = '/pages/goods/order_pay_status/index?order_id=' +
+										orderId +
+										'&msg=' + `支付成功`;
+									setTimeout(res => {
+										uni.redirectTo({
+											url: url
+										})
+									}, 2000)
+
+								},
+								fail: (e) => {
+									let url = '/pages/goods/order_pay_status/index?order_id=' +
+										orderId +
+										'&msg=' + `支付失败`;
+									uni.showModal({
+										content: `支付失败`,
+										showCancel: false,
+										success: function(res) {
+											if (res.confirm) {
+												uni.redirectTo({
+													url: url
+												})
+											} else if (res.cancel) {}
+										}
+									})
+								},
+								complete: () => {
+									uni.hideLoading();
+								},
+							});
+							// #endif
+							break;
+					}
+
+				}).catch(err => {
+					uni.hideLoading();
+					return that.$util.Tips({
+						title: err
+					}, () => {
+						that.$emit('onChangeFun', {
+							action: 'pay_fail'
+						});
+					});
+				})
+			}
+		}
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		.pay-price {
+			display: flex;
+			justify-content: center;
+			flex-direction: column;
+			align-items: center;
+			padding: 50rpx 0 40rpx 0;
+
+			.price {
+				color: #E93323;
+				margin-bottom: 20rpx;
+				display: flex;
+				align-items: flex-end;
+
+				.unit {
+					font-size: 34rpx;
+					font-weight: 500;
+					line-height: 41rpx;
+				}
+
+				.num {
+					font-size: 50rpx;
+					font-weight: 600;
+				}
+			}
+
+			.count-down {
+				display: flex;
+				align-items: center;
+				background-color: #fff;
+				padding: 8rpx 28rpx;
+				border-radius: 40rpx;
+				font-size: 24rpx;
+				color: #E93323;
+
+				.time {
+					margin-top: 0 !important;
+				}
+
+				/deep/.red {
+					margin: 0 !important;
+				}
+			}
+		}
+
+		.payment {
+			width: 690rpx;
+			border-radius: 14rpx 14rpx;
+			background-color: #fff;
+			z-index: 999;
+			margin: 0 30rpx;
+
+			.title {
+				color: #666666;
+				font-size: 26rpx;
+				padding: 30rpx 0 0 30rpx;
+			}
+
+			.payMoney {
+				font-size: 28rpx;
+				color: #333333;
+				text-align: center;
+				margin-top: 50rpx;
+
+				.font-color {
+					margin-left: 10rpx;
+
+					.money {
+						font-size: 40rpx;
+					}
+				}
+			}
+
+
+		}
+
+		.payment.on {
+			transform: translate3d(0, 0, 0);
+		}
+
+		.icon-xuanzhong11 {
+			color: #E93323 !important;
+		}
+
+		.payment .item {
+			border-bottom: 1rpx solid #eee;
+			height: 130rpx;
+			margin-left: 30rpx;
+			padding-right: 30rpx;
+		}
+
+		.payment .item:last-child {
+			border-bottom: none;
+		}
+
+		.payment .item .left {
+			flex: 1;
+		}
+
+		.payment .item .left .text {
+			flex: 1;
+		}
+
+		.payment .item .left .text .name {
+			font-size: 30rpx;
+			color: #333;
+		}
+
+		.payment .item .left .text .info {
+			font-size: 22rpx;
+			color: #999;
+		}
+
+		.payment .item .left .text .info .money {
+			color: #ff9900;
+		}
+
+		.payment .item .left .iconfont {
+			font-size: 50rpx;
+			color: #09bb07;
+			margin-right: 28rpx;
+		}
+
+		.payment .item .left .iconfont.icon-zhifubao {
+			color: #00aaea;
+		}
+
+		.payment .item .left .iconfont.icon-yuezhifu {
+			color: #ff9900;
+		}
+
+		.payment .item .left .iconfont.icon-yuezhifu1 {
+			color: #eb6623;
+		}
+
+		.payment .item .left .iconfont.icon-tonglianzhifu1 {
+			color: #305fd8;
+		}
+
+		.payment .item .iconfont {
+			font-size: 40rpx;
+			color: #ccc;
+		}
+
+		.icon-haoyoudaizhifu {
+			color: #F34C3E !important;
+		}
+
+		.btn {
+			position: fixed;
+			left: 30rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			bottom: 30rpx;
+			bottom: calc(30rpx + constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+			bottom: calc(30rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+		}
+
+		.wait-pay {
+			color: #aaa;
+			font-size: 24rpx;
+			padding-top: 20rpx;
+		}
+
+		.button {
+			width: 690rpx;
+			height: 90rpx;
+			border-radius: 45rpx;
+			color: #FFFFFF;
+			background-color: #E93323;
+
+		}
+
+	}
+</style>
diff --git a/yudao-ui-app/pages/users/login/index.vue b/yudao-ui-app/pages/users/login/index.vue
index 36d01c63b..90f8adb92 100644
--- a/yudao-ui-app/pages/users/login/index.vue
+++ b/yudao-ui-app/pages/users/login/index.vue
@@ -379,7 +379,7 @@
     background-size:100% 672rpx;
 
     .logo-wrap {
-      margin: 285rpx 0 85rpx 0;
+      margin: 185rpx 0 85rpx 0;
       display:flex;
       align-items:center;
       img{
@@ -478,7 +478,7 @@
         justify-content: center;
         width: 100%;
         height: 87rpx;
-        margin-top: 237rpx;
+        margin-top: 137rpx;
         color: #FFFFFF;
         font-size: 32rpx;
         background: linear-gradient(0deg, #E63163 0%, #FF819F 100%);
@@ -486,7 +486,7 @@
       }
 
       .tips {
-        margin: 125rpx 20rpx 0 20rpx;
+        margin: 60rpx 20rpx 0 20rpx;
         font-size: 24rpx;
         color: #000;
         display: flex;
diff --git a/yudao-ui-app/pages/users/register/index.vue b/yudao-ui-app/pages/users/register/index.vue
index 30b4ba1ce..675d9e2d9 100644
--- a/yudao-ui-app/pages/users/register/index.vue
+++ b/yudao-ui-app/pages/users/register/index.vue
@@ -206,7 +206,7 @@
     background-size:100% 672rpx;
 
     .logo-wrap {
-      margin: 285rpx 0 85rpx 0;
+      margin: 185rpx 0 85rpx 0;
       display:flex;
       align-items:center;
       img{
diff --git a/yudao-ui-app/pages/users/retrievePassword/index.vue b/yudao-ui-app/pages/users/retrievePassword/index.vue
index 06812bd90..7b9fa568d 100644
--- a/yudao-ui-app/pages/users/retrievePassword/index.vue
+++ b/yudao-ui-app/pages/users/retrievePassword/index.vue
@@ -154,7 +154,7 @@
     background-size: 100% 672rpx;
 
     .logo-wrap {
-      margin: 285rpx 0 85rpx 0;
+      margin: 185rpx 0 85rpx 0;
       display:flex;
       align-items:center;
       img{
diff --git a/yudao-ui-app/pages/users/user_spread_code/index.vue b/yudao-ui-app/pages/users/user_spread_code/index.vue
index 81605e4f1..50064ea71 100644
--- a/yudao-ui-app/pages/users/user_spread_code/index.vue
+++ b/yudao-ui-app/pages/users/user_spread_code/index.vue
@@ -58,6 +58,7 @@
   import {
     imageBase64
   } from "@/api/public";
+  import appConfig from '@/config/app.js'
   export default {
     components: {
       // #ifdef MP
@@ -203,9 +204,7 @@
         let that = this;
         let href = '';
         // href = window.location.href.split('/pages')[0];
-        console.log('uid', that.uid)
-        const baseUrl = 'http://yuxy.perrymake.com';
-        const url =`${baseUrl}/pages/member_application/index?redirectUrl=${baseUrl}&tenantId=${that.tenantId}&spreadId=${that.uid}`
+        const url =`${appConfig.SPREAD_DOMAIN}${appConfig.SPREAD_LINK}?redirectUrl=${appConfig.SPREAD_DOMAIN}&tenantId=${that.tenantId}&spreadId=${that.uid}`
         console.log('url', url)
         uQRCode.make({
           canvasId: 'qrcode',