commit -m 4月小需求

components/cm-module/modelAlert/shareModel.vue

@@ -0,0 +1,140 @@
+<template name="sharealert">
+	<view class="alert spec" :class="specClass">
+		<view class="model-warp">
+			<view class="content">
+				<view class="text-content">
+					<view class="title">分享登录</view>
+					<view class="text">
+						<text>分享后，机构联系人可直接通过分享页面登录并绑定微信成为运营人员</text>
+					</view>
+				</view>				
+				<view class="alert-btn">
+					<view class="btn btn-cancel" @click="hideConfirm">取消</view>
+					<!-- #ifdef MP-WEIXIN -->
+					<button class="btn btn-confirm" open-type="share" @click="btnConfirm(orderID)">去分享</button>
+					<!-- #endif -->
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		name:'sharealert',
+		props:{
+			orderID:{
+				type:Number
+			}
+		},
+		data() {
+			return{
+				shareCode:'',
+			}
+		},
+		created() {
+			
+		},
+		methods:{
+			hideConfirm(){
+				this.$parent.isShareModal = false
+			},
+			btnConfirm(orderID){//点击事件
+				this.$emit('btnConfirm')
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	/*弹窗*/
+	 .model-warp.none{
+		 display: none;
+	 }
+	 .model-warp.show{
+		 display: block;
+	 }
+	 .model-warp{
+		width: 100%;
+		height: 100%;
+		background: rgba(0,0,0,0.3);
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 10000;
+		transition: all 0.4s;
+		&.none{
+			display: none;			
+		}
+		&.show{
+			display: block;
+		}
+		.content{
+			width: 518rpx;
+			height: 360rpx;
+			position: absolute;
+			background: $bg-color;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			top: 0;
+			margin: auto;
+			border-radius: 24rpx;
+			.text-content{
+				width: 448rpx;
+				height: 200rpx;
+				padding: 30rpx 35rpx;
+				float: left;
+				.title{
+					line-height: 44rpx;
+					font-size: $font-size-28;
+					color: $text-color;
+					text-align: center;
+					font-weight: bold;
+					margin-bottom: 36rpx;
+				}
+				.share{
+					line-height: 36rpx;
+					font-size: $font-size-26;
+					color: $text-color;
+					text-align: justify;
+					margin-top: 22rpx;
+					font-weight: normal;
+					.txt{
+						margin-left: 10rpx;
+						color: #FF2A2A;
+					}
+				}
+				.text{
+					line-height: 44rpx;
+					font-size: $font-size-28;
+					color: $text-color;
+					text-align: justify;
+					margin-top: 22rpx;
+				}
+			}
+			.alert-btn{
+				width: 80%;
+				height: 70rpx;
+				display: flex;
+				margin: 0 auto;
+				.btn{
+					flex: 1;
+					line-height: 70rpx;
+					font-size: $font-size-28;
+					text-align: center;
+					color: #FFFFFF;
+					border-radius: 35rpx;
+					padding: 0;
+					margin: 0 15rpx;
+					&.btn-cancel{
+						background: #e1e1e1;
+					}
+					&.btn-confirm{
+						background: #4ad04c;
+					}
+				}
+			}
+		}	
+	}
+</style>

components/cm-module/orderDetails/sellerDetaileButton.vue

@@ -2,7 +2,7 @@
 	<view class="button-template" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 		<!-- 底部按钮 -->
 		<view class="button-content">
-			<view class="btn btn-cancel"  v-if="secondHandOrderFlag!=1"  @click.stop="btnConfirm('again',order)">再来一单</view>
+			<view class="btn btn-cancel"  v-if="secondHandOrderFlag!=1 && !rechargeGoods"  @click.stop="btnConfirm('again',order)">再来一单</view>
 			<view class="btn btn-cancel" v-if="btnState.isCancel"  @click.stop="btnConfirm('cancel',order)">取消订单</view>
 			<view class="btn btn-cancel" v-if="btnState.isDelete"  @click.stop="btnConfirm('delete',order)">删除订单</view>
 			<view class="btn btn-share" @click.stop="onShareCode">

components/cm-module/orderDetails/sellerOrderButton.vue

@@ -2,9 +2,9 @@
 	<view class="button-template">
 		<!-- 底部按钮 -->
 		<view class="button-content"> 
+			<view class="btn btn-cancel" v-if="secondHandOrderFlag!=1 && !rechargeGoods"  @click.stop="btnConfirm('again',orderID)">再来一单</view>
 			<view class="btn btn-cancel" v-if="btnState.isCancel" @click.stop="btnConfirm('cancel',orderID)">取消订单</view>
 			<view class="btn btn-cancel" v-if="btnState.isDelete" @click.stop="btnConfirm('delete',orderID)">删除订单</view>
-			<view class="btn btn-cancel" v-if="secondHandOrderFlag!=1"  @click.stop="btnConfirm('again',orderID)">再来一单</view>
 			<view class="btn btn-cancel"  @click.stop="onShareCode(orderID,userID)">分享订单</view>	
 			<view class="btn btn-color" v-if="btnState.isConfirm" @click.stop="btnConfirm('confirm',orderID)">确认订单</view>
 		</view>
@@ -24,6 +24,9 @@
 			userID:{
 				type:Number
 			},
+			rechargeGoods:{
+				type:Boolean
+			},
 			serviceProviderId:{
 				type:Number
 			},

pages/login/binding.vue

@@ -102,7 +102,7 @@
 					</view>
 				</view>
 				<view class="register-row">
-					<view class="register-btn sub" @click.stop="SubmitRegister">确定</view>
+					<view class="register-btn sub" @click.stop="SubmitRegister">确认并登录</view>
 				</view>
 			</view>
 		</view>
@@ -125,7 +125,7 @@
 					userId:0,
 					mobile:'',
 					linkName:'',
-					unionId:uni.getStorageSync('unionId'),
+					unionId:0,
 					isCheckSmsCode:1,
 					nickName:'',
 					avatarUrl:'',
@@ -144,13 +144,6 @@
 			console.log(option)
 			uni.setStorageSync('bind_id', option.userId);
 			this.params.userId = option.userId
-			authorize.checkLogin().then(res => {
-				this.getWxAuthorize()
-			})
-			.catch(err => {
-				this.isRegisterShow= true
-				this.$api.navigateTo('/pages/authorization/authorization')
-			})
 		},
 		filters: {
 			FirstFormat:function(type) {//处理金额
@@ -197,7 +190,7 @@
 						}else if(response.data.userIdentity === 3){
 							this.$api.navigateTo('/supplier/pages/index/index')
 						}else{
-							this.GetClubUserInfo(this.params.userId)
+							this.GetClubUserInfo()
 							this.isRegisterShow= true
 						}
 					},1000)
@@ -206,7 +199,7 @@
 					this.logout()
 					uni.setStorageSync('unionId',error.data.unionId)
 					this.$store.commit('updateStatus',error.data)
-					this.GetClubUserInfo(this.params.userId)
+					this.GetClubUserInfo()
 					this.isRegisterShow = true
 				})
 			},	
@@ -214,6 +207,7 @@
 				const userInfo = uni.getStorageSync('wechatUserInfo')
 				this.params.nickName = userInfo.nickName
 				this.params.avatarUrl = userInfo.avatarUrl
+				this.params.unionId = uni.getStorageSync('unionId')
 				this.UserService.BindingWechat(this.params)
 				.then(response =>{
 					this.login(response.data)
@@ -224,8 +218,8 @@
 					this.isUserInfo = true
 				})			
 			},
-			GetClubUserInfo(userId){
-				this.UserService.OrganizationUpdateModifyInfo({userId:userId})
+			GetClubUserInfo(){
+				this.UserService.OrganizationUpdateModifyInfo({userId:uni.getStorageSync('bind_id')})
 				.then(response =>{
 					this.isUserIdentity = response.data.user.userIdentity
 					this.clubInfo = response.data.club
@@ -249,7 +243,13 @@
 			}
 		},
 		onShow() {
-			
+			authorize.checkLogin().then(res => {
+				this.getWxAuthorize()
+			})
+			.catch(err => {
+				this.isRegisterShow= true
+				this.$api.navigateTo('/pages/authorization/authorization')
+			})
 		}
 	}
 </script>
@@ -262,7 +262,7 @@
 		width: 100%;
 		position: relative;
 		box-sizing: border-box;
-		padding-bottom: 411rpx;
+		padding-bottom: 440rpx;
 		.register-main{
 			width: 100%;
 			height: auto;

pages/login/register-supplier.vue

@@ -297,7 +297,7 @@
 				isCheck:false,			//是否勾选协议
 				userID:'',		//公司userID
 				clubID:'',		//公司ID
-				stepIndex:0,
+				stepIndex:2,
 				firstParmas:{
 					bindMobile:'',
 					smsCode:'',
@@ -517,7 +517,7 @@
 					return
 				}
 				if(this.threeParmas.website){
-					if(!this.$reg.isWebsite(this.twoParmas.website)){
+					if(!this.$reg.isWebsite(this.threeParmas.website)){
 						this.$util.msg('请输入正确的网站地址',2000);
 						return
 					}

pages/tabBar/home/index.vue

@@ -14,7 +14,7 @@
 		<!-- 楼层 -->
 		<view class="container-section tui-skeleton">
 			<page-floor :list="pageList" :userIdentity="userIdentity" :pageType='1' v-if="isRequest"></page-floor>
-			<supplier-list :supplierObj="supplierObj" v-if="isRequest"></supplier-list>
+			<!-- <supplier-list :supplierObj="supplierObj" v-if="isRequest"></supplier-list> -->
 		</view>
 		<!-- 侧边 -->
 		<scroll-top :isScrollTop="isScrollTop" :bottom="50"></scroll-top>

pages/user/order/order-details.vue

@@ -9,7 +9,7 @@
 				<text class="bage-auto" v-if="information.orderSubmitType == 0 || information.orderSubmitType == 1 ||information.orderSubmitType == 2">自主</text>
 			</view>
 			<!-- 地址选择 -->
-			<order-address ref="orderAddress" v-if="isRequest" :addressData="addressData"></order-address>
+			<order-address ref="orderAddress" v-if="isRequest && !rechargeGoods" :addressData="addressData"></order-address>
 			<!-- 商品 -->
 			<goods-list ref='goods' v-if="isRequest" :shopOrderData="shopOrderData" :information="information" @popupClick="hanldePopupFn"></goods-list>
 			<!-- 订单信息 -->
@@ -106,6 +106,7 @@
 				discernReceiptList:{},		//支付信息初始化
 				receiptAmount:0,			//支付金额
 				returnedPurchaseFee:0,		//退款金额
+				rechargeGoods:false,
 				navbarHeight:'',
 				headerBtnPosi:	this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
 				systeminfo: this.setSysteminfo(),		 //获取设备信息
@@ -179,6 +180,7 @@
 					this.shareCode = resData.shareCode
 					this.addressData = resData.userInfo
 					this.information = resData.order
+					this.rechargeGoods = resData.order.rechargeGoods
 					this.btnStatus = resData.order.status
 					this.payStatus = resData.order.payStatus
 					this.payableAmount = resData.order.payableAmount

seller/pages/club/list.vue

@@ -50,7 +50,7 @@
 										  {{showBadge(item.orderNum)}}
 									</text>
 								</view>
-								<button open-type="share" class="btn yel" @click.stop="shareBindClub(item)">分享登录</button>
+								<view class="btn yel" @click.stop="shareBindClub(item)">分享登录</view>
 							</view>
 						</view>	
 					</view>		
@@ -76,6 +76,8 @@
 				</view>
 			</view>
 		</view>
+		<!-- 分享弹窗 -->
+		<shareModel  v-if="isShareModal" :orderID="shareClubUseId" @shareConfirm ='onShareAppMessage'></shareModel>
 	</view>
 </template>
 
@@ -83,10 +85,13 @@
 	import authorize from '@/common/config/authorize.js'	
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
+	import shareModel from '@/components/cm-module/modelAlert/shareModel.vue'			 //分享弹窗
+	
 	export default {
 		components:{
 			tuiLoadmore,
 			tuiNomore,
+			shareModel
 		},
 		data() {
 			return {
@@ -96,6 +101,7 @@
 				isShowClose:false,
 				searchInputVal:'',
 				isEmpty:false,
+				isShareModal:false,
 				nomoreText: '上拉显示更多',
 				userIdentity:4,
 				pageNum:1,
@@ -252,11 +258,7 @@
 			},
 			shareBindClub(item){//分享登录
 				this.shareClubUseId = item.userID
-				return {
-				  title: '您已注册采美365网，请点击登录',
-				  path: `pages/login/binding?userId=${item.userID}`,
-				  imageUrl:'https://static.caimei365.com/app/img/icon/icon-addShare@3x.png'
-				}
+				this.isShareModal = true
 			},
 			onShowClose () {//输入框失去焦点时触发
 				if(this.searchInputVal != ''){
@@ -290,14 +292,17 @@
 			})
 		},
 		onShareAppMessage(res){//分享转发
+			this.isShareModal = false
 			if (res.from === 'button') {
 		      // 来自页面内转发按钮
+				 let path = `pages/login/binding?userId=${this.shareClubUseId}`
+				 console.log(path)
+				 return {
+					title: '您已注册采美365网，请点击登录',
+					path: path,
+					imageUrl:'https://static.caimei365.com/app/img/icon/icon-addShare@3x.png'
+				 }
 		    }
-			return {
-			title: '您已注册采美365网，请点击登录',
-			path: `pages/login/binding?userId=${this.shareClubUseId}`,
-			imageUrl:'https://static.caimei365.com/app/img/icon/icon-addShare@3x.png'
-			}
 		},
 	}
 </script>

seller/pages/login/register-general.vue

@@ -37,21 +37,29 @@
 			</view>
 			<view class="register-fiexd clearfix" :style="{paddingBottom:isIphoneX ? '68rpx':''}">
 				<view class="register-row">
-					<button open-type="share" class="register-btn sub" @tap="ShareRegister">分享</button>
+					<button class="register-btn sub" @tap="ShareRegister">分享</button>
 				</view>
 			</view>
 		</view>
+		<!-- 分享弹窗 -->
+		<shareModel  v-if="isShareModal" :orderID="clubInfo.userId" @shareConfirm ='onShareAppMessage'></shareModel>
 	</view>
 </template>
 
 <script>
+	import shareModel from '@/components/cm-module/modelAlert/shareModel.vue'			 //分享弹窗
+	
 	export default{
+		components:{
+			shareModel
+		},
 		data() {
 			return{
 				isRegisterStep:true,
 				isIphoneX:this.$store.state.isIphone,
 				isCheck:false,
 				clubUserId:0,
+				isShareModal:false,
 				params:{
 					linkMan:'',
 					bindMobile:'',
@@ -128,14 +136,8 @@
 					this.$util.msg(error.msg,2000)
 				})
 			},
-			ShareRegister(res){
-				if (res.from === 'button') { // 来自页面内转发按钮
-				}
-				return {
-				  title: '您已注册采美365网，请点击登录',
-				  path: `/pages/login/binding?userId=${this.clubInfo.userId}`,
-				  imageUrl:'https://static.caimei365.com/app/img/icon/icon-addShare@3x.png'
-				}
+			ShareRegister(){//点击分享
+				this.isShareModal = true
 			},
 			agreeCheck() {//勾选协议
 				this.isCheck = !this.isCheck
@@ -147,6 +149,7 @@
 			},
 		},
 		onShareAppMessage(res){//分享转发
+			this.isShareModal = false
 			if (res.from === 'button') {
 		      // 来自页面内转发按钮
 		    }

seller/pages/login/register-member.vue

@@ -4,39 +4,39 @@
 		<view class="register-main" v-if="isRegisterStep">
 			<view class="main-form-item">
 				<view class="form-label">联系人</view>
-				<input class="form-input" type="text" name="input" v-model="params.linkMan" placeholder="请输入联系姓名" maxlength="6"/>
+				<input class="form-input" type="text" name="input" v-model.trim="params.linkMan" placeholder="请输入联系姓名" maxlength="6"/>
 			</view>
 			<view class="main-form-item">
 				<view class="form-label">手机号</view>
-				<input class="form-input phone" type="text" v-model="params.bindMobile" placeholder="请输入联系人手机号" maxlength="11"/>
+				<input class="form-input phone" type="text" v-model.trim="params.bindMobile" placeholder="请输入联系人手机号" maxlength="11"/>
 				<view class="form-btn" @click.stop="CheckMobile()">检测</view>
 			</view>
 			<view class="main-form-item">
 				<view class="form-label">邮箱</view>
-				<input class="form-input" type="text" name="input" v-model="params.contractEmail" placeholder="请输入机构邮箱地址" maxlength="30"/>
+				<input class="form-input" type="text" name="input" v-model.trim="params.contractEmail" placeholder="请输入机构邮箱地址" maxlength="30"/>
 			</view>
 			<view class="main-form-item">
 				<view class="form-label">机构名称</view>
-				<input class="form-input" type="text" name="input" v-model="params.name" placeholder="请输入机构名称" maxlength="30"/>
+				<input class="form-input" type="text" name="input" v-model.trim="params.name" placeholder="请输入机构名称" maxlength="30"/>
 			</view>
 			<view class="main-form-item">
 				<view class="form-label">机构简称</view>
-				<input class="form-input" type="text" name="input" v-model="params.shortName" placeholder="请输入机构简称" maxlength="10"/>
+				<input class="form-input" type="text" name="input" v-model.trim="params.shortName" placeholder="请输入机构简称" maxlength="10"/>
 			</view>
 			<view class="main-form-item" @click="showMulLinkageThreePicker">
 				<view class="form-label">机构地址</view>
 				<view  class="form-input" 
-					   :class="params.address === '请选择机构所在地区' ? 'none' : ''">
-					   {{params.address}}
+					   :class="addressText === '请选择机构所在地区' ? 'none' : ''">
+					   {{addressText}}
 				</view>		
 				<view class="iconfont icon-xiayibu"></view>
 			</view>
 			<view class="main-form-item textarea">
-				<view class="textarea show" v-if="isShowInput" @click="showTextareaFocus">{{params.addressDetail ? params.addressDetail :'详细地址：如道路、门牌号、小区等'}}</view>
+				<view class="textarea show" v-if="isShowInput" @click="showTextareaFocus">{{params.address ? params.address :'详细地址：如道路、门牌号、小区等'}}</view>
 				<textarea 	v-else
 							class="textarea" 
 							type="text" 
-							v-model="params.addressDetail" 
+							v-model="params.address" 
 							placeholder="详细地址：如道路、门牌号、小区等" 
 							placeholder-class="placeholder"
 							maxlength="35"
@@ -111,7 +111,7 @@
 					</view>
 				</view>
 			</view>		
-			<view class="main-form-item none" v-if="isDepartment">
+			<view class="main-form-item none" v-if="params.secondClubType == 2 || params.secondClubType == 3">
 				<view class="form-label none">科室</view>
 				<textarea class="textarea-ke"  placeholder="请填写经营的科室，至少三个，用逗号隔开" placeholder-style="placeholder" v-model="params.department" maxlength="16"></textarea>
 			</view>	
@@ -183,7 +183,7 @@
 			</view>
 			<view class="main-form-item">
 				<view class="form-label">机构地址</view>
-				<view class="form-input">{{ clubInfo.addressDetail }}</view>		
+				<view class="form-input">{{ clubInfo.provincialAddress }}</view>		
 			</view>
 			<view class="main-form-item">
 				<view class="form-textarea">{{ clubInfo.address }}</view>		
@@ -222,7 +222,7 @@
 					</view>	
 				</view>
 			</view>	
-			<view class="main-form-item" v-if="clubInfo.secondClubType == 2">
+			<view class="main-form-item" v-if="clubInfo.secondClubType == 2 || clubInfo.secondClubType == 3">
 				<view class="form-label">科室</view>
 				<view class="form-text">{{ clubInfo.department }}</view>
 			</view>
@@ -236,23 +236,31 @@
 			</view>
 			<view class="register-fiexd clearfix" :style="{paddingBottom:isIphoneX ? '68rpx':''}">
 				<view class="register-row">
-					<button open-type="share" class="register-btn sub" @tap="ShareRegister">分享</button>
+					<button class="register-btn sub" @tap="ShareRegister">分享</button>
 				</view>
 			</view>
 		</view>
+		<!-- 地址Pciker -->
 		<city-Picker :themeColor="themeColor"
 					 ref="CityPicker" 
 					 :pickerValueDefault="cityPickerValueDefault"
 					 @onCancel="onCancel" 
 					 @onConfirm="onConfirm">
 		</city-Picker>
+		<!-- 分享弹窗 -->
+		<shareModel  v-if="isShareModal" :orderID="clubInfo.userId" @shareConfirm ='onShareAppMessage'></shareModel>
 	</view>
 </template>
 
 <script>
+	
 	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/json/data.json.js' //本地数据
+	import shareModel from '@/components/cm-module/modelAlert/shareModel.vue'			 //分享弹窗
 	import { uploadFileImage } from "@/api/utils.js"
 	export default{
+		components:{
+			shareModel
+		},
 		data() {
 			return{
 				isRegisterStep:true,
@@ -260,11 +268,13 @@
 				isCheck:false,
 				clubUserId:0,
 				isShowInput:true,
+				isShareModal:false,
 				isDepartment:false,
 				textareaFocus:false,
 				beautyList:beautyList,
 				mentuzCampList:mentuzCampNullList,
 				medicaCampList:medicaCampNullList,
+				addressText:'请选择机构所在地区',
 				params:{
 					userId:0,
 					name:'',
@@ -274,7 +284,6 @@
 					contractEmail:'',
 					socialCreditCode:'',
 					isAgreed:0,
-					address:'请选择机构所在地区',
 					townId:'',			//区ID
 					cityId:'',			//区ID
 					provinceId:'',		//区ID
@@ -375,7 +384,7 @@
 					this.$util.msg('请选择机构地址',2000);
 					return
 				}
-				if( this.params.addressDetail == ''){
+				if( this.params.address == ''){
 					this.$util.msg('请填写机构详细地址',2000);
 					return
 				}
@@ -432,14 +441,8 @@
 					this.$util.msg(error.msg,2000)
 				})
 			},
-			ShareRegister(res){
-				if (res.from === 'button') { // 来自页面内转发按钮
-				}
-				return {
-				  title: '您已注册采美365网，请点击登录',
-				  path: `/pages/login/binding?userId=${this.clubInfo.userId}`,
-				  imageUrl:'https://static.caimei365.com/app/img/icon/icon-addShare@3x.png'
-				}
+			ShareRegister(){//点击分享
+				this.isShareModal = true
 			},
 			agreeCheck() {//勾选协议
 				this.isCheck = !this.isCheck
@@ -462,11 +465,11 @@
 				this.textareaFocus = false
 			},
 			onTextareaInput(e){//地址详细信息
-			   this.params.addressDetail = e.detail.value;
+			   this.params.address = e.detail.value;
 			},
 			onConfirm(e) {//获取选择的地址信息
 				console.log('地址',e);
-				this.params.address = e.name;
+				this.addressText = e.name;
 				this.params.townId = e.townCode;
 				this.params.cityId = e.cityCode;
 				this.params.provinceId = e.provinceCode;
@@ -608,6 +611,7 @@
 		   },
 		},
 		onShareAppMessage(res){//分享转发
+			this.isShareModal = false
 			if (res.from === 'button') { // 来自页面内转发按钮
 		    }
 			return {

seller/pages/order/create-recharge-order.vue

@@ -21,7 +21,7 @@
 			</view>
 			<view class="created-item">
 				<view class="label">备注：</view>
-				<input class="input" type="number" v-model="params.note" placeholder="选填，最多不超过50个汉字" maxlength="50"/>
+				<input class="input" type="text" v-model="params.note" placeholder="选填，最多不超过50个汉字" maxlength="50"/>
 			</view>
 			<view class="created-item">
 				<view class="label-total">合计：<text class="red">￥{{params.price | NumFormat}}</text>  </view>

seller/pages/order/order-details.vue

@@ -185,11 +185,11 @@
 				this.OrderService.QueryOrderDetails({ orderID : this.orderID }).then(response =>{
 					let resData = response.data;
 					this.isRequest = true
-					this.rechargeGoods = resData.rechargeGoods
 					this.userID = resData.order.userID
 					this.shareCode = resData.shareCode
 					this.addressData = resData.userInfo
 					this.information = resData.order
+					this.rechargeGoods = resData.order.rechargeGoods
 					this.btnStatus = resData.order.status
 					this.payStatus = resData.order.payStatus
 					this.shopOrderData = resData.shopOrderList

seller/pages/order/order-historylist.vue

@@ -83,6 +83,7 @@
 								<!-- 底部button -->
 								<order-button ref="orderButton" 
 											  :status="order.status" 
+											  :rechargeGoods = "order.rechargeGoods"
 											  :orderID="order.orderID" 
 											  :userID = "order.userID"
 											  :secondHandOrderFlag = "order.secondHandOrderFlag"

seller/pages/order/order-list.vue

@@ -93,6 +93,7 @@
 								<order-button ref="orderButton" 
 											  :status="order.status" 
 											  :orderID="order.orderID" 
+											  :rechargeGoods = "order.rechargeGoods"
 											  :userID = "order.userID"
 											  :secondHandOrderFlag = "order.secondHandOrderFlag"
 											  @buttonConfirm="handButtonConfirm">

seller/pages/search/search-order.vue

@@ -90,6 +90,7 @@
 							<!-- 底部button -->
 							<order-button ref="orderButton" 
 										  :status="order.status" 
+										  :rechargeGoods = "order.rechargeGoods"
 										  :orderID="order.orderID" 
 										  :userID="order.userID" 
 										  @buttonConfirm="handButtonConfirm">