commit -m 5月小需求测试优化

components/cm-module/modelAlert/shareModel.vue

@@ -11,7 +11,7 @@
 				<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>
+					<button class="btn btn-confirm" open-type="share" @click="btnConfirm(bindId)">去分享</button>
 					<!-- #endif -->
 				</view>
 			</view>
@@ -23,7 +23,7 @@
 	export default{
 		name:'sharealert',
 		props:{
-			orderID:{
+			bindId:{
 				type:Number
 			}
 		},

main.js

@@ -36,7 +36,7 @@ Vue.prototype.$getStorage = function(key){
  * 友盟+小程序统计
  */
 
-if(process.env.NODE_ENV != 'development'){
+// if(process.env.NODE_ENV != 'development'){
 	// #ifdef MP-WEIXIN
 	uma.init({
 		appKey: umtrackWxKey, //由友盟分配的APP_KEY
@@ -54,7 +54,7 @@ if(process.env.NODE_ENV != 'development'){
 	}
 	Vue.use(uma)
 	// #endif
-}
+// }
 
 // Vue实例化
 Vue.config.productionTip = false

pages/login/binding.vue

@@ -143,7 +143,7 @@
 			
 		},	
 		onLoad(option) {
-			console.log(option)
+			console.log('option=========>',this.option)
 			uni.setStorageSync('bind_id', option.bindId);
 			this.bindId = Number(option.bindId)
 			this.isUserIdentity = option.Identity
@@ -207,11 +207,14 @@
 				})
 			},	
 			GetClubUserInfo(){//查询填写资料
+				console.log('=========<查询填写资料>===========')
+				console.log('bindId',this.bindId)
 				this.UserService.UseRregisterTemporaryInfo({id:this.bindId})
 				.then(response =>{
 					this.clubInfo = response.data
 					this.params.mobile = this.clubInfo.bindMobile
 					this.params.linkName = this.clubInfo.linkMan
+					console.log('params=========>',this.params)
 					if(this.clubInfo.mainProduct){
 						this.medicaCampList = this.ArrayFormat(this.clubInfo.mainProduct)
 					}

second/pages/form/form-seller.vue

@@ -255,7 +255,7 @@
 							:class="checkbox?'icon-jiagexiangliao':'icon-juxingweigouxuan'" ><span style="margin-left: 10rpx;">已阅读</span></span>
 						</view>
 						<view class="BtnAll" :style="{ paddingBottom :isIphoneX ? '68rpx' : '0rpx' }">
-							<view   @click="submitBtn" class="btn-submit">发布</view>
+							<view  @click="submitBtn" class="btn-submit">发布</view>
 						</view>
 				 </form>
 				 <!-- 地址弹窗 -->
@@ -313,7 +313,7 @@
 				],
 				BrandList:[],
 				isShow:false,
-				GoodsImagesList:['https://dss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2306696130,3636777462&fm=26&gp=0.jpg'],
+				GoodsImagesList:[],
 				secondParams:{
 					secondHandType:'',//一级分类
 					instrumentType:'',//二手仪器分类
@@ -331,14 +331,14 @@
 					productQuality:'',//商品成色
 					contactName:'',//联系人
 					contactMobile:'',//联系方式
-					authenticationImage:'https://dss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2306696130,3636777462&fm=26&gp=0.jpg',//身份验证图片
-					commitmentImage:'https://dss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2306696130,3636777462&fm=26&gp=0.jpg',//承诺函图片
+					authenticationImage:'',//身份验证图片
+					commitmentImage:'',//承诺函图片
 					dockingPeopleName:'',//采美对接人姓名
 					dockingPeopleMobile:'',//采美对接人手机号
 					secondProductType:'',//
 					townId:'',//县区地址
 					address:'',//详细地址
-					image:'https://dss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2306696130,3636777462&fm=26&gp=0.jpg',//图片
+					image:'',//图片
 					fileName:'',
 					ossName:'',
 					productDetails:'',//商品详细信息
@@ -979,9 +979,7 @@
 			text-align: center;
 			line-height: 90rpx;
 			color: #fff;
-			background-image: linear-gradient(315deg, 
-					#f28f31 0%, 
-					#e15616 100%);
+			background-image: $btn-confirm;
 			border-radius: 90rpx;
 			font-size: 30rpx;
 		}

second/pages/form/form.vue

@@ -180,11 +180,11 @@
 					    </view> 
 						<text class="iconfont icon-xiayibu"></text>
 					 </view>
-					 <textarea  type="text"
-								class="border-grey address-details"
-								v-model="secondParams.address"
+					 <textarea  type="text"  
+								class="border-grey address-details" 
+								v-model="secondParams.address" 
 								maxlength="50"
-								placeholder="请填写详细地址，如街道/小区/门牌等"
+								placeholder="请填写详细地址，如街道/小区/门牌等"  
 								placeholder-class="placeholder"/>
 					</textarea>
 					<view class="release-main-container">
@@ -211,7 +211,7 @@
 							<view class="label">二手出让承诺函文件</view>
 							<view class="spacing file-none" v-if="secondParams.fileName == ''">
 								<view class="file-none-button" @click="uploadCommitmentFile">上传</view>
-							</view>
+							</view> 
 							<view class="spacing file-text" v-else>
 								<text class="file-text-em">{{ secondParams.fileName }}</text>
 								<i class=" del iconfont icon-shanchu1" @click="deleteCommitmentFile"></i>
@@ -255,7 +255,7 @@
 							:class="checkbox?'icon-jiagexiangliao':'icon-juxingweigouxuan'" ><span style="margin-left: 10rpx;">已阅读</span></span>
 						</view>
 						<view class="BtnAll" :style="{ paddingBottom :isIphoneX ? '68rpx' : '0rpx' }">
-							<view   @click="submitBtn" class="btn-submit">发布</view>
+							<view  @click="submitBtn" class="btn-submit">发布</view>
 						</view>
 				 </form>
 				 <!-- 地址弹窗 -->
@@ -313,7 +313,7 @@
 				],
 				BrandList:[],
 				isShow:false,
-				GoodsImagesList:['https://dss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2306696130,3636777462&fm=26&gp=0.jpg'],
+				GoodsImagesList:[],
 				secondParams:{
 					secondHandType:'',//一级分类
 					instrumentType:'',//二手仪器分类
@@ -331,14 +331,14 @@
 					productQuality:'',//商品成色
 					contactName:'',//联系人
 					contactMobile:'',//联系方式
-					authenticationImage:'https://dss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2306696130,3636777462&fm=26&gp=0.jpg',//身份验证图片
-					commitmentImage:'https://dss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2306696130,3636777462&fm=26&gp=0.jpg',//承诺函图片
+					authenticationImage:'',//身份验证图片
+					commitmentImage:'',//承诺函图片
 					dockingPeopleName:'',//采美对接人姓名
 					dockingPeopleMobile:'',//采美对接人手机号
 					secondProductType:'',//
 					townId:'',//县区地址
 					address:'',//详细地址
-					image:'https://dss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2306696130,3636777462&fm=26&gp=0.jpg',//图片
+					image:'',//图片
 					fileName:'',
 					ossName:'',
 					productDetails:'',//商品详细信息
@@ -439,18 +439,7 @@
 				})
 			},
 			deleteCommitmentFile(){//删除承诺函文件
-				this.UploadService.PostFileDelete(
-					{
-						ossName:this.secondParams.ossName,
-					}
-				)
-				.then(res=>{
-					this.secondParams.fileName = '';
-					this.secondParams.ossName = '';
-				})
-				.catch(error =>{
-					console.log('删除文件异常提示===>',error.msg)
-				})
+				this.secondParams.fileName = ''
 			},
 			removeGoodsImagesFn(index){//删除商品图片
 				this.GoodsImagesList.splice(index,1);
@@ -577,7 +566,7 @@
 				this.SecondHandProduct(this.secondParams)
 			},
 			SecondHandProduct(params){//提交发布
-				this.SecondService.SecondHandProduct(params).then(res=>{
+				this.SecondService.SecondHandProduct(params).then(res=>{ 
 					this.PopupShow = true;
 					this.tipsContentText = '发布二手商品，采美需要收取您每个商品100元的展示费，展示期为3个月支付完成后，商品会在1-2个工作日内进行审核，审核通过后，商品会立即上线'
 					this.cancelButtonText = '取消发布'
@@ -595,7 +584,7 @@
 					case 1:
 						this.SecondHandProduct(this.secondParams)
 						break;
-					case 2:
+					case 2:	
 						this.PopupShow = false;
 						break;
 				}
@@ -605,7 +594,7 @@
 					case 1:
 						this.PopupShow = false;
 						break;
-					case 2:
+					case 2:	
 						this.MiniWxPayFor()
 						this.PopupShow = false;
 						break;
@@ -990,9 +979,7 @@
 			text-align: center;
 			line-height: 90rpx;
 			color: #fff;
-			background-image: linear-gradient(315deg, 
-					#f28f31 0%, 
-					#e15616 100%);
+			background-image: $btn-confirm;
 			border-radius: 90rpx;
 			font-size: 30rpx;
 		}

seller/pages/club/list.vue

@@ -50,7 +50,7 @@
 										  {{showBadge(item.orderNum)}}
 									</text>
 								</view>
-								<view class="btn yel" @click.stop="shareBindClub(item)">分享登录</view>
+								<!-- <view class="btn yel" @click.stop="shareBindClub(item)">分享登录</view> -->
 							</view>
 						</view>	
 					</view>		

seller/pages/login/register-general.vue

@@ -42,7 +42,7 @@
 			</view>
 		</view>
 		<!-- 分享弹窗 -->
-		<shareModel  v-if="isShareModal" :orderID="clubInfo.userId" @shareConfirm ='onShareAppMessage'></shareModel>
+		<shareModel  v-if="isShareModal" :bindId="bindId" @shareConfirm ='onShareAppMessage'></shareModel>
 	</view>
 </template>
 
@@ -60,6 +60,7 @@
 				isCheck:false,
 				clubUserId:0,
 				isShareModal:false,
+				bindId:0,
 				params:{
 					linkMan:'',
 					bindMobile:'',
@@ -117,10 +118,10 @@
 					return
 				}
 				this.SellerService.SellerClubTemporary(this.params).then(response =>{
-					this.clubInfo.userId = response.data
+					this.bindId = response.data
 					setTimeout(()=>{
 						this.isRegisterStep = false
-						this.GetClubUserInfo(this.clubInfo.userId)
+						this.GetClubUserInfo(this.bindId)
 					},1500)
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);
@@ -154,7 +155,7 @@
 		    }
 			return {
 			  title: '您已注册采美365网，请点击登录',
-			  path: `/pages/login/binding?bindId=${this.clubInfo.userId}&Identity=4`,
+			  path: `/pages/login/binding?bindId=${this.bindId}&Identity=4`,
 			  imageUrl:'https://static.caimei365.com/app/img/icon/icon-addShare@3x.png'
 			}
 		},

seller/pages/login/register-member.vue

@@ -248,7 +248,7 @@
 					 @onConfirm="onConfirm">
 		</city-Picker>
 		<!-- 分享弹窗 -->
-		<shareModel  v-if="isShareModal" :orderID="clubInfo.userId" @shareConfirm ='onShareAppMessage'></shareModel>
+		<shareModel  v-if="isShareModal" :bindId="bindId" @shareConfirm ='onShareAppMessage'></shareModel>
 	</view>
 </template>
 
@@ -306,6 +306,7 @@
 					{name:'生美',value:2}
 				],
 				current:0,
+				bindId:0,
 				customItemValue:'', 	//自定义项目
 				showMainProductList:[]
 			}
@@ -421,10 +422,10 @@
 					return
 				}
 				this.SellerService.SellerClubTemporary(this.params).then(response =>{
-					this.clubInfo.userId = response.data
+					this.bindId = response.data
 					setTimeout(()=>{
 						this.isRegisterStep = false
-						this.GetClubUserInfo(this.clubInfo.userId)
+						this.GetClubUserInfo(this.bindId)
 					},2000)
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);
@@ -615,7 +616,7 @@
 		    }
 			return {
 			  title: '您已注册采美365网，请点击登录',
-			  path: `/pages/login/binding?bindId=${this.clubInfo.userId}&Identity=2`,
+			  path: `/pages/login/binding?bindId=${this.bindId}&Identity=2`,
 			  imageUrl:'https://static.caimei365.com/app/img/icon/icon-addShare@3x.png'
 			}
 		},