commit -m 供应商注册增加字段

main.js

@@ -5,7 +5,7 @@ import './services/index.js'
 import * as Api from '@/common/config/caimeiApi.js'
 import * as Regs from '@/common/config/common.js'
 import { umtrackWxKey } from '@/utils/config.js'
-import uma from 'umtrack-wx';
+// import uma from 'umtrack-wx';
 
 import { msg, modal,prePage } from'./utils/util'
 import cuCustom from './components/cm-custom/cu-custom.vue'

pages/login/apply-supplier.vue

@@ -137,6 +137,44 @@
 						>确认添加</button>
 					</view>
 				</view>
+			</view>
+			<view class="register-row clearfix">
+				<view class="register-from">
+					<view class="label">网站地址:</view>
+					<input class="row-input" type="text" v-model="shopInfo.website" placeholder="请输入公司网站地址" maxlength="100"/>
+				</view>
+			</view>
+			<view class="register-row clearfix">
+				<view class="register-from">
+					<view class="label">微信公众号:</view>
+					<input class="row-input" type="text" v-model="shopInfo.wxOfficialAccount" placeholder="请输入公司微信公众号" maxlength="20"/>
+				</view>
+			</view>
+			<view class="register-row clearfix">
+				<view class="register-from">
+					<view class="label">微信小程序:</view>
+					<input class="row-input" type="text" v-model="shopInfo.wxApplets" placeholder="请输入公司微信小程序名称" maxlength="20"/>
+				</view>
+			</view>
+			<view class="register-row text-textarea clearfix">
+				<view class="label">公司主打系列商品说明:</view>
+				<textarea   v-model="shopInfo.mainProductDesc"  
+							class="textarea" 
+							maxlength="5000" 
+							placeholder="请输入公司主打系列商品说明" 
+							placeholder-class="placeholder" 
+							name="textarea"
+				/>
+			</view>
+			<view class="register-row text-textarea clearfix">
+				<view class="label">公司介绍:</view>
+				<textarea   v-model="shopInfo.shopDesc"  
+							class="textarea" 
+							maxlength="5000" 
+							placeholder="请输入公司介绍" 
+							placeholder-class="placeholder" 
+							name="textarea"
+				/>
 			</view>	
 			<view class="register-main clearfix">
 				<view class="register-agree">
@@ -203,6 +241,11 @@
 					secondShopType: 0,
 					mainProduct:'',				//公司主营内容
 					isAgreed:1,				//勾选协议状态
+					website:'',//网站地址
+					wxOfficialAccount:'',//微信公众号
+					wxApplets:'',//微信小程序
+					mainProductDesc:'',//公司主打商品说明
+					shopDesc:'',//公司介绍
 				},
 				addressText:'请选择公司所在地区',
 				isDisabled:true,
@@ -250,6 +293,11 @@
 						this.shopInfo.email = this.$reg.checkData(supplierUser.email)
 						this.shopInfo.shortName = this.$reg.checkData(supplierShop.shortName)
 						this.addressText = supplierShop.provincialAddress ? supplierShop.provincialAddress : '请选择公司所在地区'
+						this.shopInfo.website = supplierShop.website
+						this.shopInfo.wxOfficialAccount = supplierShop.wxOfficialAccount
+						this.shopInfo.wxApplets = supplierShop.wxApplets
+						this.shopInfo.mainProductDesc = supplierShop.mainProductDesc
+						this.shopInfo.shopDesc = supplierShop.shopDesc
 						this.shopInfo.address = supplierShop.address
 						this.shopInfo.provinceId = supplierShop.provinceId
 						this.shopInfo.cityId = supplierShop.cityId

pages/login/register-supplier.vue

@@ -327,6 +327,11 @@
 					isAgreed:0,
 					whichStep:3,
 					source:1,
+					website:'',//网站地址
+					wxOfficialAccount:'',//微信公众号
+					wxApplets:'',//微信小程序
+					mainProductDesc:'',//公司主打商品说明
+					shopDesc:'',//公司介绍
 				},
 				addressText:'请选择公司所在地区',
 				isDisabled:true,

seller/pages/club/list.vue

@@ -78,7 +78,7 @@
 										  {{showBadge(item.orderNum)}}
 									</text>
 								</view>
-								<button open-type="share" class="btn yel" @tap="shareBindClub">分享登录</button>
+								<button open-type="share" class="btn yel" @click.stop="shareBindClub">分享登录</button>
 							</view>
 						</view>	
 					</view>		
@@ -120,6 +120,7 @@
 			return {
 				listTab:[{name:'普通机构'},{name:'会员机构'}],
 				serviceProviderId:'',
+				shareClubUseId:0,
 				isShowClose:false,
 				searchInputVal:'',
 				isEmpty:false,
@@ -278,10 +279,11 @@
 				this.$api.navigateTo(`/seller/pages/order/order-historylist?clubID=${item.clubID}&listType=0`)
 			},
 			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-sharebind.jpg'
+				  imageUrl:'https://static.caimei365.com/app/img/icon/icon-addShare@3x.png'
 				}
 			},
 			onShowClose () {//输入框失去焦点时触发
@@ -314,7 +316,17 @@
 				this.pageNum = 1;
 				this.initclubList();
 			})
-		}
+		},
+		onShareAppMessage(res){//分享转发
+			if (res.from === 'button') {
+		      // 来自页面内转发按钮
+		    }
+			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

@@ -145,7 +145,17 @@
 					this.params.isAgreed = 0
 				}
 			},
-		}
+		},
+		onShareAppMessage(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'
+			}
+		},
 	}
 </script>
 

seller/pages/login/register-member.vue

@@ -255,7 +255,7 @@
 	export default{
 		data() {
 			return{
-				isRegisterStep:false,
+				isRegisterStep:true,
 				isIphoneX:this.$store.state.isIphone,
 				isCheck:false,
 				clubUserId:0,