提交修复测试问题

common/config/config.js

@@ -3,10 +3,9 @@ if(process.env.NODE_ENV === 'development'){
     // 开发环境
 	// URL_CONFIG = 'http://192.168.1.22:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.1.26:8008'	 //超超联调地址
-	// URL_CONFIG = 'http://192.168.1.24:8008'	 //俊俊联调地址
     URL_CONFIG = 'https://spi-b.caimei365.com'//采美测试地址
 }else{
     // 生产环境
-    URL_CONFIG = 'https://spi.caimei365.com'
+    // URL_CONFIG = 'https://spi.caimei365.com'
 }
 export default URL_CONFIG

components/module/creatOrder/invoiceTent.vue

@@ -58,7 +58,7 @@
 						<view class="invoice-group tit">
 							<checkbox-group class="row-group" @change="checkboxChange">
 								<view class="text">商品明细</view>
-								<checkbox class="row-radio" value="明细"  :checked="inventoryChecked ? true : false" color="#E15616"></checkbox>
+								<checkbox class="row-radio" value="明细"  :checked="inventoryChecked" color="#E15616"></checkbox>
 							</checkbox-group>
 						</view>
 						<view class="invoice-ltitle">发票抬头</view>
@@ -71,14 +71,14 @@
 							</radio-group>
 						</view>
 						<view class="invoice-group from">
-							<view class="group-from" v-if="invoiceData.invoiceTitleType == '0'">
-								<input class="form-input" type="text" v-model="invoiceData.invoiceTitle"   placeholder="请填写个人抬头" maxlength="20">
+							<view class="group-from" v-if="peopleInvoiceData.invoiceTitleType == '0'">
+								<input class="form-input" type="text" v-model="peopleInvoiceData.invoiceTitle"   placeholder="请填写个人抬头" maxlength="20">
 							</view>
-							<view class="group-from" v-if="invoiceData.invoiceTitleType == '1'">
-								<input class="form-input" type="text" v-model="invoiceData.invoiceTitle"   placeholder="请填写公司抬头" maxlength="20">
+							<view class="group-from" v-if="peopleInvoiceData.invoiceTitleType == '1'">
+								<input class="form-input" type="text" v-model="peopleInvoiceData.invoiceTitle"   placeholder="请填写公司抬头" maxlength="20">
 							</view>
-							<view class="group-from" v-if="invoiceData.invoiceTitleType == '1'">
-								<input class="form-input" type="text" v-model="invoiceData.corporationTaxNum"   placeholder="请填写纳税人识别号" maxlength="20">
+							<view class="group-from" v-if="peopleInvoiceData.invoiceTitleType == '1'">
+								<input class="form-input" type="text" v-model="peopleInvoiceData.corporationTaxNum"   placeholder="请填写纳税人识别号" maxlength="20">
 							</view>
 						</view>
 					</view>
@@ -115,16 +115,20 @@
 					{value:'0',name:'个人'},
 					{value:'1',name:'公司'},
 				],
+				peopleInvoiceData:{
+					invoiceTitle:'',   //单位名称
+					invoiceContent:'', //商品明细
+					corporationTaxNum:'',//纳税人识别号
+					invoiceTitleType:'0'//发票抬头类型 1企业 0个人
+				},
 				invoiceData:{
 					id:'',
-					invoiceContent:'',	 //商品明细
 					invoiceTitle:'',	 //单位名称
 					corporationTaxNum:'',//纳税人识别号
 					registeredAddress: '',//单位地址
 					registeredPhone:'',	 //注册电话
 					openBank:'',		//开户银行
 					bankAccountNo: ''  ,//银行账号
-					invoiceTitleType:'0',//发票抬头类型 1企业 0个人
 				},
 			}
 		},
@@ -136,7 +140,7 @@
 		},
 		methods:{
 			getUseFindInvoice(){//获取发票信息
-				this.$api.getComStorage('orderUserInfo').then((resolve) =>{
+				this.$api.getStorage().then((resolve) => {
 					getFindInvoice({userId:resolve.userID}).then(response =>{
 						if(response.data == null){
 							this.invoiceData = Object.assign(this.invoiceData,'',{type:0})
@@ -147,7 +151,7 @@
 				})
 			},
 			updateInvoiceFn(){//保存发票信息
-				this.$api.getComStorage('orderUserInfo').then((resolve) =>{
+				this.$api.getStorage().then((resolve) => {
 					let params =Object.assign(this.invoiceData,'',{userId:resolve.userID})
 					updateInvoice(params).then(response =>{})
 				})
@@ -160,7 +164,7 @@
 						break;
 					case '2':
 						this.choiceaInvoiceTwo()
-						this.invoiceText = this.invoiceData.invoiceTitle
+						this.invoiceText = this.peopleInvoiceData.invoiceTitle
 						break;
 					case '3':
 						this.choiceaInvoiceFirst()
@@ -201,32 +205,37 @@
 				this.hideSpec()
 			},
 			choiceaInvoiceTwo(){//普通发票
-				if(this.invoiceData.invoiceContent == ''){
-					this.$util.msg('请选择商品明细',2000)
-					return
-				}
-				switch(this.invoiceData.invoiceTitleType){
+				switch(this.peopleInvoiceData.invoiceTitleType){
 					case '0':
-						if(this.invoiceData.invoiceTitle == ""){
+						if(this.peopleInvoiceData.invoiceContent == ''){
+							this.$util.msg('请选择商品明细',2000)
+							return
+						}
+						if(this.peopleInvoiceData.invoiceTitle == ""){
 							this.$util.msg('请输入个人抬头',2000)
 							return
 						}
 						break;
 					case '1':
-						if(this.invoiceData.invoiceTitle == ""){
+						if(this.peopleInvoiceData.invoiceContent == ''){
+							this.$util.msg('请选择商品明细',2000)
+							return
+						}
+						if(this.peopleInvoiceData.invoiceTitle == ""){
 							this.$util.msg('请输入公司抬头',2000)
 							return
 						}
-						if(this.invoiceData.corporationTaxNum == ""){
+						if(this.peopleInvoiceData.corporationTaxNum == ""){
 							this.$util.msg('请输入纳税人识别号',2000)
 							return
 						}
 						break;
 				}
-				this.$emit('handleChoiceaInvoice',Object.assign(this.invoiceData,'',{type:1}))
+				this.$emit('handleChoiceaInvoice',Object.assign(this.peopleInvoiceData,'',{type:1}))
 				this.hideSpec()
 			},
 			choiceaInvoiceThree(){//不开发票
+				this.invoiceData = {}
 				this.$emit('handleChoiceaInvoice',Object.assign(this.invoiceData,'',{type:0}))
 				this.hideSpec()
 			},
@@ -247,21 +256,35 @@
 						break;
 					}
 				}
-				if(this.invoiceType == '3'){
-					this.getUseFindInvoice()
-				}
+				switch(this.invoiceType){
+					case '2':
+						this.peopleInvoiceData.invoiceTitleType = "0"
+						this.titleCurrent = 0
+						break;
+					case '3':
+						this.getUseFindInvoice()
+						break;
+				}		
 			},
 			radioChangeTitle(e) {
-				this.invoiceData.invoiceTitleType = e.target.value;
+				this.peopleInvoiceData.invoiceTitleType = e.target.value;
 				for (let i = 0; i < this.invoiceTitleList.length; i++) {
-					if (this.invoiceTitleList[i].value === this.invoiceData.invoiceTitleType) {
+					if (this.invoiceTitleList[i].value === this.peopleInvoiceData.invoiceTitleType) {
 						this.titleCurrent = i;
 						break;
 					}
 				}
+				switch(this.peopleInvoiceData.invoiceTitleType){
+					case '1':
+						this.inventoryChecked = false
+						this.peopleInvoiceData.invoiceTitle = ""
+						this.peopleInvoiceData.invoiceContent = ""
+						break;
+				}		
 			},
 			checkboxChange(e){
-				this.invoiceData.invoiceContent = e.detail.value[0]
+				this.inventoryChecked = !this.inventoryChecked
+				this.peopleInvoiceData.invoiceContent = e.detail.value[0]
 			},
 			inputBankNum(val) {
 				if (/\S{5}/.test(val)) {

components/module/creatOrder/sellerAddress.vue

@@ -65,6 +65,7 @@
 					this.addressSrc = '/market/pages/address/addressManage'
 				}else{
 					this.isEmpty = false
+					this.$parent.isFreight = false
 					this.addressSrc = '/market/pages/address/address?type=select'
 				}
 			}

components/module/creatOrder/sellerFreight.vue

@@ -57,7 +57,7 @@
 		data() {
 			return{
 				freightText:'不包邮',
-				freightMoney:10,
+				freightMoney:0,
 				specClass: '',//规格弹窗css类，控制开关动画
 				freightList:[
 					{value:1,name:'不包邮'},
@@ -67,7 +67,7 @@
 				current:0,
 				freightData:{
 					freePostFlag:1,
-					freight:10
+					freight:0
 				}
 			}
 		},
@@ -89,12 +89,14 @@
 						this.current = 1;
 						this.freightData.freePostFlag = data.freePostFlag;
 						this.freightText = '包邮'
+						this.freightMoney = 0
 						this.freightData.freight  = 0
 						break;
 					case -1:
 						this.current = 2;
 						this.freightData.freePostFlag = data.freePostFlag;
 						this.freightText = '到付'
+						this.freightMoney = 0
 						this.freightData.freight  = 0
 						break;
 				}
@@ -145,9 +147,11 @@
 						break;
 					case 0:
 						this.freightText = '包邮'
+						this.freightMoney = 0
 						break;
 					case -1:
 						this.freightText = '到付'
+						this.freightMoney = 0
 						break;	
 				}		
 				for (let i = 0; i < this.freightList.length; i++) {
@@ -158,7 +162,11 @@
 				}
 			},
 			setFreightMoney(e){//处理邮费显示
-				this.freightMoney = this.orderPriceToFixed(e.detail.value)
+				if(e.detail.value == ''){
+					this.freightMoney=0
+				}else{
+					this.freightMoney = this.orderPriceToFixed(e.detail.value)
+				}
 			},
 			orderPriceToFixed (num){
 				let price ='';

components/module/creatOrder/sellerInvoice.vue

@@ -58,7 +58,7 @@
 						<view class="invoice-group tit">
 							<checkbox-group class="row-group" @change="checkboxChange">
 								<view class="text">商品明细</view>
-								<checkbox class="row-radio" value="明细"  :checked="inventoryChecked ? true : false" color="#E15616"></checkbox>
+								<checkbox class="row-radio" value="明细"  :checked="inventoryChecked" color="#E15616"></checkbox>
 							</checkbox-group>
 						</view>
 						<view class="invoice-ltitle">发票抬头</view>
@@ -71,14 +71,14 @@
 							</radio-group>
 						</view>
 						<view class="invoice-group from">
-							<view class="group-from" v-if="invoiceData.invoiceTitleType == '0'">
-								<input class="form-input" type="text" v-model="invoiceData.invoiceTitle"   placeholder="请填写个人抬头" maxlength="20">
+							<view class="group-from" v-if="peopleInvoiceData.invoiceTitleType == '0'">
+								<input class="form-input" type="text" v-model="peopleInvoiceData.invoiceTitle"   placeholder="请填写个人抬头" maxlength="20">
 							</view>
-							<view class="group-from" v-if="invoiceData.invoiceTitleType == '1'">
-								<input class="form-input" type="text" v-model="invoiceData.invoiceTitle"   placeholder="请填写公司抬头" maxlength="20">
+							<view class="group-from" v-if="peopleInvoiceData.invoiceTitleType == '1'">
+								<input class="form-input" type="text" v-model="peopleInvoiceData.invoiceTitle"   placeholder="请填写公司抬头" maxlength="20">
 							</view>
-							<view class="group-from" v-if="invoiceData.invoiceTitleType == '1'">
-								<input class="form-input" type="text" v-model="invoiceData.corporationTaxNum"   placeholder="请填写纳税人识别号" maxlength="20">
+							<view class="group-from" v-if="peopleInvoiceData.invoiceTitleType == '1'">
+								<input class="form-input" type="text" v-model="peopleInvoiceData.corporationTaxNum"   placeholder="请填写纳税人识别号" maxlength="20">
 							</view>
 						</view>
 					</view>
@@ -115,16 +115,20 @@
 					{value:'0',name:'个人'},
 					{value:'1',name:'公司'},
 				],
+				peopleInvoiceData:{
+					invoiceTitle:'',
+					invoiceContent:'',
+					corporationTaxNum:'',
+					invoiceTitleType:'0'//发票抬头类型 1企业 0个人
+				},
 				invoiceData:{
 					id:'',
-					invoiceContent:'',	 //商品明细
 					invoiceTitle:'',	 //单位名称
 					corporationTaxNum:'',//纳税人识别号
 					registeredAddress: '',//单位地址
 					registeredPhone:'',	 //注册电话
 					openBank:'',		//开户银行
 					bankAccountNo: ''  ,//银行账号
-					invoiceTitleType:'0',//发票抬头类型 1企业 0个人
 				},
 			}
 		},
@@ -160,7 +164,7 @@
 						break;
 					case '2':
 						this.choiceaInvoiceTwo()
-						this.invoiceText = this.invoiceData.invoiceTitle
+						this.invoiceText = this.peopleInvoiceData.invoiceTitle
 						break;
 					case '3':
 						this.choiceaInvoiceFirst()
@@ -200,33 +204,38 @@
 				this.$emit('handleChoiceaInvoice',Object.assign(this.invoiceData,'',{type:2}))
 				this.hideSpec()
 			},
-			choiceaInvoiceTwo(){//普通发票
-				if(this.invoiceData.invoiceContent == ''){
-					this.$util.msg('请选择商品明细',2000)
-					return
-				}
-				switch(this.invoiceData.invoiceTitleType){
+			choiceaInvoiceTwo(){//普通发票			
+				switch(this.peopleInvoiceData.invoiceTitleType){
 					case '0':
-						if(this.invoiceData.invoiceTitle == ""){
+						if(this.peopleInvoiceData.invoiceContent == ''){
+							this.$util.msg('请选择商品明细',2000)
+							return
+						}
+						if(this.peopleInvoiceData.invoiceTitle == ""){
 							this.$util.msg('请输入个人抬头',2000)
 							return
 						}
 						break;
 					case '1':
-						if(this.invoiceData.invoiceTitle == ""){
+						if(this.peopleInvoiceData.invoiceContent == ''){
+							this.$util.msg('请选择商品明细',2000)
+							return
+						}
+						if(this.peopleInvoiceData.invoiceTitle == ""){
 							this.$util.msg('请输入公司抬头',2000)
 							return
 						}
-						if(this.invoiceData.corporationTaxNum == ""){
+						if(this.peopleInvoiceData.corporationTaxNum == ""){
 							this.$util.msg('请输入纳税人识别号',2000)
 							return
 						}
 						break;
 				}
-				this.$emit('handleChoiceaInvoice',Object.assign(this.invoiceData,'',{type:1}))
+				this.$emit('handleChoiceaInvoice',Object.assign(this.peopleInvoiceData,'',{type:1}))
 				this.hideSpec()
 			},
 			choiceaInvoiceThree(){//不开发票
+				this.invoiceData = {}
 				this.$emit('handleChoiceaInvoice',Object.assign(this.invoiceData,'',{type:0}))
 				this.hideSpec()
 			},
@@ -247,21 +256,35 @@
 						break;
 					}
 				}
-				if(this.invoiceType == '3'){
-					this.getUseFindInvoice()
-				}
+				switch(this.invoiceType){
+					case '2':
+						this.peopleInvoiceData.invoiceTitleType = "0"
+						this.titleCurrent = 0
+						break;
+					case '3':
+						this.getUseFindInvoice()
+						break;
+				}		
 			},
 			radioChangeTitle(e) {
-				this.invoiceData.invoiceTitleType = e.target.value;
+				this.peopleInvoiceData.invoiceTitleType = e.target.value;
 				for (let i = 0; i < this.invoiceTitleList.length; i++) {
-					if (this.invoiceTitleList[i].value === this.invoiceData.invoiceTitleType) {
+					if (this.invoiceTitleList[i].value === this.peopleInvoiceData.invoiceTitleType) {
 						this.titleCurrent = i;
 						break;
 					}
 				}
+				switch(this.peopleInvoiceData.invoiceTitleType){
+					case '1':
+						this.inventoryChecked = false
+						this.peopleInvoiceData.invoiceTitle = ""
+						this.peopleInvoiceData.invoiceContent = ""
+						break;
+				}		
 			},
 			checkboxChange(e){
-				this.invoiceData.invoiceContent = e.detail.value[0]
+				this.inventoryChecked = !this.inventoryChecked
+				this.peopleInvoiceData.invoiceContent = e.detail.value[0]
 			},
 			inputBankNum(val) {
 				if (/\S{5}/.test(val)) {

components/module/listTemplate/buyagainList.vue

@@ -290,7 +290,7 @@
 			padding: 10rpx 10rpx 10rpx 0;
 		}
 		.list-none{
-			margin-top: 30rpx;
+			margin-top: 15rpx;
 			.price-small{
 				font-size:$font-size-24;
 				line-height: 40rpx;

components/module/listTemplate/immediatelyList.vue

@@ -367,7 +367,7 @@
 			padding: 10rpx 10rpx 10rpx 0;
 		}
 		.list-none{
-			margin-top: 30rpx;
+			margin-top: 15rpx;
 			.price-small{
 				font-size:$font-size-24;
 				line-height: 40rpx;

components/module/orderDetails/sellerOrderButton.vue

@@ -2,7 +2,7 @@
 	<view class="button-template">
 		<!-- 底部按钮 -->
 		<view class="button-content">
-			<view class="btn btn-share"  @click.stop="onShareCode(orderID,clubUserid)">分享订单</view>	
+			<view class="btn btn-share"  @click.stop="onShareCode(orderID,userID)">分享订单</view>	
 			<view class="btn btn-confirm" v-if="btnState.isConfirm" @click.stop="btnConfirm('confirm',orderID)">确认订单</view>
 			<view class="btn btn-cancel" v-if="btnState.isCancel" @click.stop="btnConfirm('cancel',orderID)">取消订单</view>
 			<view class="btn btn-delete" v-if="btnState.isDelete" @click.stop="btnConfirm('delete',orderID)">删除订单</view>
@@ -20,7 +20,7 @@
 			orderID: {
 				type:Number
 			},
-			clubUserid:{
+			userID:{
 				type:Number
 			}
 		},
@@ -85,7 +85,7 @@
 			onShareCode(oID,uID){
 				this.$parent.isShareModal = true
 				this.$parent.btnoRderID = oID,
-				this.$parent.clubUserID = uID
+				this.$parent.btnClubUserID = uID
 				this.$emit('shareConfirm')
 			},
 			btnConfirm(type,id){

components/seller/user.vue

@@ -2,11 +2,11 @@
 	<view class="container user clearfix">
 		<view class="user-section">
 			<view class="u-header">
-				<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/03/%E6%88%91%E7%9A%84%20%E2%80%93%201%403x.png" mode=""></image>
+				<image src="https://img.caimei365.com/group1/M00/03/94/Cmis216Sk_SAPDwvAAcTspdl8h0610.png" mode=""></image>
 				<view class="u-header-main">
 					<view class="user-item">
 						<view class="logo-m">
-							<image :src="headpic ? headpic:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E5%8D%8F%E9%94%80%E9%BB%98%E8%AE%A4%E5%A4%B4%E5%83%8F.png'" mode=""></image>
+							<image :src="headpic ? headpic:'https://img.caimei365.com/group1/M00/03/94/Cmis216Sk_OAZaxVAAANf4oruy4674.png'" mode=""></image>
 							<text class="txt">协销员工</text>
 						</view>
 					</view>
@@ -95,6 +95,8 @@
 <script>
 	import uniBadge from '@/components/uni-badge/uni-badge.vue'
 	import { mapState,mapMutations } from 'vuex'
+	import authorize from '@/common/config/authorize.js'
+	import { userInfoLogin } from "@/api/use.js"
 	import { getSellerHome } from "@/api/seller.js"
 	
 	export default{
@@ -125,11 +127,30 @@
 		created() {
 			this.initData()
 		},
-		computed: {
-			...mapState(['hasLogin','userInfo'])
-		},
 		methods:{
+			...mapMutations(['login','logout']),
 			initData(){
+				authorize.getCode('weixin').then(wechatcode =>{// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
+					authorize.getUserInfo('weixin').then(wxResponse =>{
+						userInfoLogin({code:wechatcode,encryptedData:wxResponse.encryptedData,iv:wxResponse.iv}).then(response =>{
+							this.$store.commit('updateStatus',response.data)
+							this.login(response.data);
+							uni.setStorageSync('token',response.data.token)
+							uni.removeStorageSync('sessionid')
+							uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
+							this.getUserSellerHome()
+						}).catch(response =>{
+							this.logout()
+							console.log('222222222')
+							uni.removeStorageSync('sessionid')
+							uni.setStorageSync('sessionid','JSESSIONID='+response.data)
+							this.$store.commit('updateStatus',response.data)
+							this.$api.navigateTo('/market/pages/login/login')
+						})
+					})
+				})
+			},
+			getUserSellerHome(){
 				this.$api.getStorage().then((resolve) =>{
 					this.userId = resolve.userID
 					getSellerHome({userId:this.userId}).then(response =>{

market/pages/address/addressManage.vue

@@ -14,11 +14,11 @@
 				<text class="iconfont icon-xiayibu"></text>
 			</view>
 			<view class="text-textarea b-b"> 
-				<view class="textarea show" v-if="isShowInput">{{addressData.addressDetail ?addressData.addressDetail :'详细地址：如道路、门牌号、小区、楼房号、单元室等'}}</view>
+				<view class="textarea show" v-if="isShowInput">{{addressData.address ?addressData.address :'详细地址：如道路、门牌号、小区、楼房号、单元室等'}}</view>
 				<textarea 	v-else
 							class="textarea" 
 							type="text" 
-							v-model="addressData.addressDetail" 
+							v-model="addressData.address" 
 							placeholder="详细地址：如道路、门牌号、小区、楼房号、单元室等" 
 							placeholder-class="placeholder"
 							maxlength="50"
@@ -64,7 +64,7 @@
 					shouHuoRen: '',		//收货人
 					mobile:'',			//收货人手机
 					townID:'',			//区ID
-					addressDetail: '',	//地址
+					address: '',	//地址
 					defaultFlag:0,		//是否默认收货地址(0 不是默认,1 默认)
 				},
 				params:{}				//参数
@@ -78,7 +78,7 @@
 				this.addType = 2;	
 				let optionData = JSON.parse(option.data)
 				this.addressData.allAddress = `${optionData.province}-${optionData.city}-${optionData.town}`
-				this.addressData.addressDetail = optionData.address
+				this.addressData.address = optionData.address
 				this.addressData.defaultFlag = optionData.defaultFlag;
 				this.addressData.userID = optionData.userID;
 				this.addressData.mobile = optionData.mobile;
@@ -130,7 +130,7 @@
 							userID:this.addressData.userID  ,		//用户id ,只在新增收货地址时传
 							shouHuoRen:this.addressData.shouHuoRen ,//收货人
 							townID:this.addressData.townID,			//区ID
-							addressDetail:this.addressData.addressDetail,//地址
+							address:this.addressData.address,//地址
 							mobile:this.addressData.mobile,			//手机
 							defaultFlag:this.addressData.defaultFlag//是否默认收货地址(0 不是默认,1 默认)
 						}
@@ -175,11 +175,11 @@
 			   this.initInput();
 			},
 			onTextareaInput(e){
-			   this.addressData.addressDetail = e.detail.value;
+			   this.addressData.address = e.detail.value;
 			   this.initInput();
 			},
 			initInput(){
-				if(this.addressData.shouHuoRen !== "" && this.addressData.mobile !=="" && this.addressData.addressDetail !==""){
+				if(this.addressData.shouHuoRen !== "" && this.addressData.mobile !=="" && this.addressData.address !==""){
 					this.isConfirm =false;
 				}else{
 					this.isConfirm =true;

market/pages/cart/cart.vue

@@ -29,7 +29,7 @@
 										</view>
 										<view class="pros-img" @click.stop="navToListPage(pros.productID)"><image :src="pros.mainImage ? pros.mainImage :''" alt="" /></view>
 										<view class="pros-product">
-											<view class="producttitle" @click.stop="navToListPage(pros.id)"	>
+											<view class="producttitle" @click.stop="navToListPage(pros.productID)"	>
 												{{pros.name}}
 											</view>
 											<view class="productspec">规格:{{pros.unit ? pros.unit : ''}}</view>
@@ -381,7 +381,7 @@
 			},
 			processActivityPrice(pros){//单独处理活动价格和阶梯价格
 				let ladderPriceList = pros.ladderPriceList;
-				if(pros.ladderPriceFlag == '0' || pros.actFlag == 1){
+				if(pros.ladderPriceFlag == '0' || pros.actStatus == 1){
 					pros.retailPrice = pros.retailPrice
 				}else{
 					ladderPriceList.forEach((item,index)=>{

market/pages/club/allClub-list.vue

@@ -3,7 +3,14 @@
 		<view class="club-search clearfix">
 			<view class="search-from name">
 				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-				<input class="input" type="text" v-model="searchInputVal" @input="onShowClose" placeholder="请输入机构关键词" maxlength="16"/>
+				<input class="input" 
+					   type="text" 
+					   confirm-type="search" 
+					   v-model="searchInputVal" 
+					   @input="onShowClose" 
+					   @confirm="initclubList()" 
+					   placeholder="请输入机构关键词" 
+					   maxlength="16"/>
 				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
 			</view>
 			<view class="search-btn">

market/pages/club/club-list.vue

@@ -3,7 +3,15 @@
 		<view class="club-search clearfix">
 			<view class="search-from name">
 				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-				<input class="input" type="text" v-model="searchInputVal" placeholder="请输入机构名称搜索" maxlength="12"/>
+				<input class="input" 
+					   type="text" 
+					   confirm-type="search" 
+					   v-model="searchInputVal" 
+					    @input="onShowClose" 
+					   @confirm="initclubList()" 
+					   placeholder="请输入机构名称搜索" 
+					   maxlength="12"/>
+				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
 			</view>
 			<view class="search-btn">
 				<button class="search-btn" type="default" @click.stop="searchClubList">搜索</button>
@@ -216,7 +224,8 @@
 			background: #F7F7F7;
 			border-radius: 14rpx;
 			float: left;
-			.iconfont{
+			position: relative;
+			.icon-iconfonticonfontsousuo1{
 				width: 64rpx;
 				height: 64rpx;
 				line-height: 64rpx;
@@ -226,6 +235,18 @@
 				float: left;
 				color: #999999;
 			}
+			.icon-shanchu1{
+				font-size: $font-size-32;
+				color: #999999;
+				position: absolute;
+				width: 64rpx;
+				height: 64rpx;
+				line-height: 64rpx;
+				text-align: center;
+				top: 0;
+				right: 0;
+				z-index: 10;
+			}
 			.input{
 				width: 500rpx;
 				height: 64rpx;
@@ -263,9 +284,11 @@
 				.list-head{
 					width: 140rpx;
 					height: 140rpx;
+					border-radius: 14rpx;
 					image{
 						width: 140rpx;
 						height: 140rpx;
+						border-radius: 14rpx;
 					}
 				}
 			}

market/pages/club/list.vue

@@ -3,7 +3,14 @@
 		<view class="club-search clearfix">
 			<view class="search-from name">
 				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-				<input class="input" type="text" v-model="searchInputVal" @input="onShowClose" placeholder="请输入机构名称" maxlength="16"/>
+				<input class="input" 
+					   type="text" 
+					   confirm-type="search"
+					   v-model="searchInputVal" 
+					   @input="onShowClose" 
+					   @confirm="initclubList()" 
+					   placeholder="请输入机构名称" 
+					   maxlength="16"/>
 				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
 			</view>
 			<view class="search-btn">

market/pages/login/apply.vue

@@ -121,7 +121,7 @@
 			<view class="register-row clearfix" v-show="isDepartment">
 				<view class="register-from">
 					<view class="label">科室:</view>
-					<input class="row-input keshi" type="text" v-model="clubContact" placeholder="请填写经营的科室，至少三个，用逗号隔开" maxlength="16"/>
+					<input class="row-input keshi" type="text" v-model="department" placeholder="请填写经营的科室，至少三个，用逗号隔开" maxlength="16"/>
 				</view>
 			</view>
 			<view class="register-row clearfix" v-if="isOrganizationType == 1">

market/pages/login/information.vue

@@ -202,7 +202,7 @@
 							placeholder="请填写公司简介，最多500字" 
 							placeholder-class="placeholder"
 							maxlength="500"
-							@input="onTextareaInput"
+							@input="onTextareaInputInfo"
 							:class="isShowInput ? '':''"
 				/>
 			</view>
@@ -443,6 +443,9 @@
 			onTextareaInput(e){
 			   this.addressData.addressDetail = e.detail.value;
 			},
+			onTextareaInputInfo(e){
+			   this.companyPprofile = e.detail.value;
+			},
 			chooseBusinessImage() {//营业执照图片上传
 				uploadFileImage().then(res =>{
 					this.uploadBusinessImage = JSON.parse(res.data).data

market/pages/login/login.vue

@@ -216,6 +216,7 @@
 			margin: 0 auto;
 			text-align: center;
 			background: $btn-confirm;
+			margin-top: 100rpx;
 		}
 		.login-tel{
 			width: 702rpx;
@@ -226,39 +227,5 @@
 			text-align: center;
 			margin-top: 100rpx;
 		}
-		.model-authorization{
-			width: 100%;
-			height: 100%;
-			position: fixed;
-			top: 0;
-			left: 0;
-			z-index: 999;
-			.authorization{
-				width: 518rpx;
-				height: 320rpx;
-				position: absolute;
-				background: rgba(255,255,255,.7);
-				left: 0;
-				right: 0;
-				bottom: 0;
-				top: 0;
-				margin: auto;
-				.to-btn{
-					position: absolute;
-					top: 0;
-					left: 0;
-					right: 0;
-					bottom: 0;
-					margin: auto;
-					width: 70%;
-					height: 88rpx;
-					font-size: $font-size-28;
-					line-height: 88rpx;
-					color: #FFFFFF;
-					text-align: center;
-					border-radius: 44rpx;
-				}
-			}
-		}
 	}
 </style>

market/pages/order/create-order.vue

@@ -183,9 +183,9 @@
 			},
 			handleChoiceaInvoiceData(data){//获取发票信息
 				this.invoiceData = data
+				console.log(data)
 			},
 			handleChoiceaFreightData(data){//获取运费信息
-				console.log(data)
 				if(data.freePostFlag == '1'){
 					this.freightData = data
 					this.payAllPrice = this.allPrice+parseInt(data.freight)
@@ -310,7 +310,6 @@
 				let SelectData = uni.getStorageSync('selectAddress');
 				this.addressID = SelectData.addressID;
 				this.addressData = SelectData
-				this.isFreight = true
 				this.getFreightData()
 			}else{
 				this.getAddressData()

market/pages/order/order-details.vue

@@ -188,7 +188,7 @@
 				return {
 					title: '您有新的分享订单，快来查看吧~',
 					path: `/pages/user/order/orderShareLogin?orderID=${this.orderID}&userID=${this.userID}&serviceProviderId=${this.serviceProviderId}`,
-					imageUrl:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/03/%E8%AE%A2%E5%8D%95%E5%88%86%E4%BA%AB%E5%9B%BE%403x.png'
+					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
 				}
 			},
 			getHeaderTopHeight(){
@@ -222,10 +222,9 @@
 			},
 		},
 		onShow() {
-			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
+			this.$api.getStorage().then((resolve) =>{
 				this.serviceProviderId = resolve.serviceProviderID
 			})
-			
 		}
 	}
 </script>

market/pages/order/order-list.vue

@@ -82,6 +82,7 @@
 		<!-- 分享弹窗 -->
 		<share-alert   v-if="isShareModal"
 					   :orderID="btnoRderID" 
+					   :clubUserID = btnClubUserID
 					   @shareConfirm ='onShareAppMessage'>
 		</share-alert>
 		<!-- 透明模态层 -->
@@ -137,6 +138,7 @@
 				scrollLeft: 0 ,//tab标题的滚动条位置
 				serviceProviderId:0,//协销用户ID
 				orderData: [],
+				btnClubUserID:0,
 				btnoRderID: 0, //点击按钮传入的的订单ID
 				pageNum: 1,	  //页数
 				pageSize: 10,  //条数
@@ -346,8 +348,8 @@
 			    }
 				return {
 					title: '您有新的分享订单，快来查看吧~',
-					path: `/market/pages/order/orderShareLogin?orderID=${this.btnoRderID}`,
-					imageUrl:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/03/%E8%AE%A2%E5%8D%95%E5%88%86%E4%BA%AB%E5%9B%BE%403x.png'
+					path: `/pages/user/order/orderShareLogin?orderID=${this.btnoRderID}&userID=${this.btnClubUserID}&serviceProviderId=${this.serviceProviderId}`,
+					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
 				}
 			},
 			//订单状态文字和颜色

market/pages/search/search-order.vue

@@ -71,6 +71,7 @@
 							<order-button ref="orderButton" 
 										  :status="order.status" 
 										  :orderID="order.orderID" 
+										  :userID="order.userID" 
 										  @buttonConfirm="handButtonConfirm">
 							</order-button>
 						</view>
@@ -127,6 +128,7 @@
 				showSkeleton: true,
 				userID:0,
 				orderList: [],
+				btnClubUserID:0,
 				btnoRderID: 0, //点击按钮传入的的订单ID
 				pageNum: 1,	  //页数
 				pageSize: 10,  //条数
@@ -348,8 +350,8 @@
 			    }
 				return {
 					title: '您有新的分享订单，快来查看吧~',
-					path: `/market/pages/order/orderShareLogin?orderID=${this.btnoRderID}`,
-					imageUrl:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/03/%E8%AE%A2%E5%8D%95%E5%88%86%E4%BA%AB%E5%9B%BE%403x.png'
+					path: `/pages/user/order/orderShareLogin?orderID=${this.btnoRderID}&userID=${this.btnClubUserID}&serviceProviderId=${this.serviceProviderId}`,
+					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
 				}
 			},
 			//订单状态文字和颜色

market/pages/search/search.vue

@@ -49,7 +49,7 @@
 				</view>
 			</scroll-view>
 			<view class="empty-container" v-if="showEmpty">
-				<image class="empty-container-image" src="https://img.caimei365.com/group1/M00/03/8D/Cmis215XHXWAHCoqAAELHadZ9Xg365.png"></image>
+				<image class="empty-container-image" src="https://img.caimei365.com/group1/M00/03/94/Cmis216Sk_SAMs28AAELHadZ9Xg226.png"></image>
 				<text class="error-text">抱歉，没有相关商品！</text>
 			</view>
 		</view>

market/pages/user/user.vue

@@ -2,11 +2,11 @@
 	<view class="container user clearfix" :style="{paddingBottom:isIphoneX?'140rpx':'98rpx'}">
 		<view class="user-section">
 			<view class="u-header">
-				<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/03/%E6%88%91%E7%9A%84%20%E2%80%93%201%403x.png" mode=""></image>
+				<image src="https://img.caimei365.com/group1/M00/03/94/Cmis216Sk_SAPDwvAAcTspdl8h0610.png" mode=""></image>
 				<view class="u-header-main">
 					<view class="user-item">
 						<view class="logo-m">
-							<image :src="headpic ? headpic:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E5%8D%8F%E9%94%80%E9%BB%98%E8%AE%A4%E5%A4%B4%E5%83%8F.png'" mode=""></image>
+							<image :src="headpic ? headpic:'https://img.caimei365.com/group1/M00/03/94/Cmis216Sk_OAZaxVAAANf4oruy4674.png'" mode=""></image>
 							<text class="txt">协销员工</text>
 						</view>
 					</view>

pages/goods/product.vue

@@ -46,8 +46,8 @@
 								</view>
 								<view class="wrap-main-price" v-else>
 									<view class="p-main" v-if="ladderPriceFlag == '0' || product.actStatus == 1">
-										<view class="p-active">
-											<image class="icon-active" src="../../static/temp/icon-active.png" mode="" v-if="product.actStatus == 1"></image>
+										<view class="p-active" v-if="product.actStatus == 1">
+											<image class="icon-active" src="../../static/temp/icon-active.png" mode="" ></image>
 										</view>
 										<view class="p-price tui-skeleton-fillet">
 											<text class="txt sm">￥</text>
@@ -154,7 +154,7 @@
 						<view class="item-bt" @click="buyProductCart()">
 							<image src="../../static/icon-cart-active@3x.png"></image>
 							<text>购物车</text>
-							<text  	v-if="hasLogin"
+							<text  	v-if="hasLogin && goodsData.cartCount>0"
 									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num"
 									:class="[goodsData.cartCount < 10 ? 'goleft':'']">
 									{{ goodsData.cartCount >= 100 ? '99+': goodsData.cartCount}}
@@ -704,7 +704,6 @@
 		.wrap-ladder{
 			float: left;
 			width: 702rpx;
-			padding: 0 24rpx;
 			border-bottom: 1px solid #F8F8F8;
 			.ladder-text{
 				height: 34rpx;
@@ -720,7 +719,7 @@
 				width: 654rpx;
 				height: 102rpx;
 				padding: 24rpx;
-				background: url(https://admin-b.caimei365.com/userfiles/1/images/photo/2020/02/%E9%98%B6%E6%A2%AF%E4%BB%B7%E6%A0%BC%E8%83%8C%E6%99%AF%403x.png);
+				background: url(https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_WASybTAAI2gyWbunM918.png);
 				background-size: cover;
 				border-radius: 20rpx;
 				display: flex;

pages/login/apply.vue

@@ -149,7 +149,7 @@
 			<view class="register-row clearfix" v-show="isDepartment">
 				<view class="register-from">
 					<view class="label">科室:</view>
-					<input class="row-input keshi" type="text" v-model="clubContact" placeholder="请填写经营的科室，至少三个，用逗号隔开" maxlength="16"/>
+					<input class="row-input keshi" type="text" v-model="department" placeholder="请填写经营的科室，至少三个，用逗号隔开" maxlength="16"/>
 				</view>
 			</view>
 			<view class="register-row clearfix" v-if="isOrganizationType == 1">
@@ -368,13 +368,13 @@ import { mapMutations } from 'vuex';
 						this.socialCreditCode = organizationClub.socialCreditCode
 						this.firstClubType = organizationClub.firstClubType
 						this.secondClubType = organizationClub.secondClubType
-						this.uploadBusinessImage = organizationClub.businessLicenseImage
-						this.uploadMentuzImage = organizationClub.headpic
-						this.uploadMedicalImage = organizationClub.medicalPracticeLicenseImg
+						this.uploadBusinessImage = this.$reg.checkData(organizationClub.businessLicenseImage) 
+						this.uploadMentuzImage = this.$reg.checkData(organizationClub.headpic)
+						this.uploadMedicalImage = this.$reg.checkData(organizationClub.medicalPracticeLicenseImg)
 						this.department = organizationClub.department						
-						this.clubTelePhone = organizationClub. contractPhone
-						this.clubFax = organizationClub.fax
-						this.companyPprofile = organizationClub.info
+						this.clubTelePhone = this.$reg.checkData(organizationClub. contractPhone)
+						this.clubFax = this.$reg.checkData(organizationClub.fax)
+						this.companyPprofile = this.$reg.checkData(organizationClub.info)
 						//机构类型&&主营项目
 						switch(this.firstClubType){
 							case '1':

pages/login/bindOperator.vue

@@ -209,7 +209,7 @@
 						sellerBindingOperation(params).then(response =>{
 							if(response.code == 0){
 								this.login(response.data);
-								this.$api.switchTabTo('/pages/tabBar/user/user')
+								this.$api.switchTabTo('/pages/tabBar/home/home')
 							}else if(response.code == 4){
 								this.login(response.data)
 								this.$api.navigateTo(`/pages/login/bindemail?pathType=1`)

pages/login/information.vue

@@ -128,10 +128,6 @@
 					<view class="label">机构类型:</view>
 					<view class="row-input picker" @click="bindPickerChange">{{ organizationTypeText }}</view>
 					<text class="iconfont icon-xiayibu"></text>
-<!-- 				<picker @change="bindPickerChange" :value="index" :range="organizationTypeList" range-key="name">
-						<view class="row-input" :class="[isOrganizationType == 0 ? 'none' : '']">{{organizationTypeList[typtIndex].name}}</view>
-					</picker>
- -->					
 				</view>
 			</view>
 			<view class="register-row clearfix" v-if="isOrganizationType == 1">
@@ -243,7 +239,7 @@
 							placeholder="请填写公司简介，最多500字" 
 							placeholder-class="placeholder"
 							maxlength="500"
-							@input="onTextareaInput"
+							@input="onTextareaInputInfo"
 							:class="isShowInput ? '':''"
 				/>
 			</view>
@@ -389,13 +385,13 @@
 						this.firstClubType = organizationClub.firstClubType
 						this.secondClubType = organizationClub.secondClubType
 						this.addressData.address =  organizationClub.provincialAddress ? organizationClub.provincialAddress : ''
-						this.uploadBusinessImage = organizationClub.businessLicenseImage ? organizationClub.businessLicenseImage :''
-						this.uploadMedicalImage = organizationClub.medicalPracticeLicenseImg ? organizationClub.medicalPracticeLicenseImg : ''
-						this.uploadMentuzImage = organizationClub.headpic ? organizationClub.headpic :''
+						this.uploadBusinessImage = this.$reg.checkData(organizationClub.businessLicenseImage)
+						this.uploadMedicalImage = this.$reg.checkData(organizationClub.medicalPracticeLicenseImg)
+						this.uploadMentuzImage = this.$reg.checkData(organizationClub.headpic)
 						this.department = organizationClub.department						
-						this.clubTelePhone = organizationClub.contractPhone ? organizationClub.contractPhone : ''
-						this.clubFax = organizationClub.fax ? organizationClub.fax : ''
-						this.companyPprofile = organizationClub.info ? organizationClub.info : ''
+						this.clubTelePhone = this.$reg.checkData(organizationClub.contractPhone)
+						this.clubFax = this.$reg.checkData(organizationClub.fax)
+						this.companyPprofile = this.$reg.checkData(organizationClub.info)
 						//机构类型&&主营项目
 						switch(this.firstClubType){
 							case '1':
@@ -565,6 +561,9 @@
 			onTextareaInput(e){
 			   this.addressData.addressDetail = e.detail.value;
 			},
+			onTextareaInputInfo(e){
+			   this.companyPprofile = e.detail.value;
+			},
 			chooseBusinessImage() {//营业执照图片上传
 				uploadFileImage().then(res =>{
 					this.uploadBusinessImage = JSON.parse(res.data).data

pages/tabBar/cart/cart.vue

@@ -31,7 +31,7 @@
 										</view>
 										<view class="pros-img" @click.stop="navToListPage(pros.productID)"	><image :src="pros.mainImage ? pros.mainImage:''" alt="" /></view>
 										<view class="pros-product">
-											<view class="producttitle" @click.stop="navToListPage(pros.id)"	>
+											<view class="producttitle" @click.stop="navToListPage(pros.productID)"	>
 												<text v-if="pros.validFlag == '3'" class="no-text">商品已下架</text>{{pros.name}}
 											</view>
 											<view class="productspec">规格:{{pros.unit ? pros.unit : ''}}</view>
@@ -426,7 +426,7 @@
 			},
 			processActivityPrice(pros){//单独处理活动价格和阶梯价格
 				let ladderPriceList = pros.ladderPriceList;
-				if(pros.ladderPriceFlag == '0' || pros.actFlag == 1){
+				if(pros.ladderPriceFlag == '0' || pros.actStatus == 1){
 					pros.retailPrice = pros.retailPrice
 				}else{
 					ladderPriceList.forEach((item,index)=>{

pages/tabBar/home/home.vue

@@ -261,8 +261,8 @@
 				console.log(e.detail.query)
 			},
 			showTost(){
-				this.$api.navigateTo('/market/pages/login/login')
 				// this.$util.msg("正在开发中，敬请期待~",2000);
+				this.$api.navigateTo(`/market/pages/login/login`)
 				// uni.navigateToMiniProgram({
 				// 	appId: 'wx5a5cda32926f55ac',
 				// 	path: '/pages/tabBar/home/home',

pages/tabBar/user/user.vue

@@ -2,7 +2,7 @@
 	<view class="container user clearfix">
 		<view class="user-section" :class="[!isShowNoLogin  ? 'show' : 'none']">
 			<view class="u-header">
-				<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/03/%E6%88%91%E7%9A%84%20%E2%80%93%201%403x.png" mode=""></image>
+				<image src="https://img.caimei365.com/group1/M00/03/94/Cmis216Sk_SAPDwvAAcTspdl8h0610.png" mode=""></image>
 				<view class="u-header-main">
 					<view class="user-item">
 						<view class="logo-m">

pages/user/account/account.vue

@@ -2,7 +2,7 @@
 	<view class="container account clearfix">
 		<view class="account-header">
 			<view class="h-account">
-				<image src="https://img.caimei365.com/group1/M00/03/8D/Cmis215XHXWAJ2l7AAGcgkqy28c765.png" mode=""></image>
+				<image src="https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SACLslAAGcgkqy28c861.png" mode=""></image>
 				<view class="m-account">
 					<view class="m-m title">
 						<text class="m-p">可用余额</text>
@@ -59,7 +59,7 @@
 			</view>
 		</scroll-view>
 		<view class="showAccounExp" :class="[isShowAccounExp == true ? 'show':'hide']" @tap="hideAccounExp">
-			<image src="https://img.caimei365.com/group1/M00/03/8D/Cmis215XHXWAZAHAAA2oDvspRRU775.png" mode=""></image>
+			<image src="https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SAZeZlAA2oDvspRRU204.png" mode=""></image>
 			<text class="iconfont icon-close" @click="hideAccounExp"></text>
 		</view>
 	</view>

pages/user/address/addressManage.vue

@@ -14,11 +14,11 @@
 				<text class="iconfont icon-xiayibu"></text>
 			</view>
 			<view class="text-textarea b-b"> 
-				<view class="textarea show" v-if="isShowInput">{{addressData.addressDetail ?addressData.addressDetail :'详细地址：如道路、门牌号、小区、楼房号、单元室等'}}</view>
+				<view class="textarea show" v-if="isShowInput">{{addressData.address ?addressData.address :'详细地址：如道路、门牌号、小区、楼房号、单元室等'}}</view>
 				<textarea 	v-else
 							class="textarea" 
 							type="text" 
-							v-model="addressData.addressDetail" 
+							v-model="addressData.address" 
 							placeholder="详细地址：如道路、门牌号、小区、楼房号、单元室等" 
 							placeholder-class="placeholder"
 							maxlength="50"
@@ -64,7 +64,7 @@
 					shouHuoRen: '',		//收货人
 					mobile:'',			//收货人手机
 					townID:'',			//区ID
-					addressDetail: '',	//地址
+					address: '',	//地址
 					defaultFlag:0,		//是否默认收货地址(0 不是默认,1 默认)
 				},
 				params:{}				//参数
@@ -78,7 +78,7 @@
 				this.addType = 2;			
 				let optionData = JSON.parse(option.data)
 				this.addressData.allAddress = `${optionData.province}-${optionData.city}-${optionData.town}`
-				this.addressData.addressDetail = optionData.address
+				this.addressData.address = optionData.address?optionData.address:''
 				this.addressData.defaultFlag = optionData.defaultFlag;
 				this.addressData.userID = optionData.userID;
 				this.addressData.mobile = optionData.mobile;
@@ -132,15 +132,13 @@
 							userID:data.userID  ,		//用户id ,只在新增收货地址时传
 							shouHuoRen:data.shouHuoRen ,//收货人
 							townID:data.townID,			//区ID
-							addressDetail:data.addressDetail,//地址
+							address:data.address,//地址
 							mobile:data.mobile,			//手机
 							defaultFlag:data.defaultFlag//是否默认收货地址(0 不是默认,1 默认)
 						}
-					console.log(this.params)
 					this.postAddressData(this.params)	
 				}else{
 					this.params =  this.addressData;
-					console.log(this.params)
 					this.postAddressData(this.params)
 				}
 			},
@@ -175,11 +173,11 @@
 			   this.initInput();
 			},
 			onTextareaInput(e){
-			   this.addressData.addressDetail = e.detail.value;
+			   this.addressData.address = e.detail.value;
 			   this.initInput();
 			},
 			initInput(){
-				if(this.addressData.shouHuoRen !== "" && this.addressData.mobile !=="" && this.addressData.addressDetail !==""){
+				if(this.addressData.shouHuoRen !== "" && this.addressData.mobile !=="" && this.addressData.address !==""){
 					this.isConfirm =false;
 				}else{
 					this.isConfirm =true;

pages/user/operator/list.vue

@@ -27,7 +27,7 @@
 				<scroll-view scroll-y="true" >
 					<view class="list" v-for="(item, index) in operatorList" :key="index" @click.stop="showOperatorModel(item)">
 						<view class="list-left">
-							<view class="list-head"><image :src="item.headimgurl ? item.headimgurl : '../../../static/temp/logo@3x.png'" mode=""></image></view>
+							<view class="list-head"><image :src="item.headimgurl ? item.headimgurl : 'https://img.caimei365.com/group1/M00/03/94/Cmis216Sk_OAfH-2AAA3tX5g6uo305.png'" mode=""></image></view>
 							<view class="list-tel">
 								<text class="txt">{{item.linkName}}</text>
 								<text class="txt">{{item.mobile}}</text>

pages/user/order/order-cashier.vue

@@ -8,7 +8,7 @@
 					<view class="txt">订单提交成功</view>
 				</view>
 				<view v-else class="cashier-wrapper">
-					<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/03/%E8%AE%A2%E5%8D%95%E6%8F%90%E4%BA%A4%E6%88%90%E5%8A%9F%EF%BC%8C%E8%AF%B7%E5%8F%8A%E6%97%B6%E8%BD%AC%E8%B4%A6%E4%BB%98%E6%AC%BE%20%EF%BC%88%E7%9B%AE%E5%89%8D%E5%8F%AA%E6%94%AF%E6%8C%81%E7%BD%91%E9%93%B6%E8%BD%AC%E8%B4%A6%EF%BC%89%E5%90%A6%E5%88%99%E8%AE%A2%E5%8D%95%E5%B0%86%E4%BC%9A%E8%A2%AB%E5%8F%96%E6%B6%88%E3%80%82%403x.png" mode=""></image>
+					<image src="https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SAKGNWAAEaFsvZ8c0647.png" mode=""></image>
 					<view class="wrapper-text">
 						<view>订单提交成功，请及时转账付款</view>
 						<view><text class="red">（目前只支持网银转账）</text>否则订单将会被取消。</view>
@@ -159,7 +159,7 @@
 				return {
 					title: '您有新的分享订单，快来查看吧~',
 					path: `/pages/user/order/orderShareLogin?orderID=${this.shareOrderID}&userID=${this.userID}`,
-					imageUrl:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/03/%E8%AE%A2%E5%8D%95%E5%88%86%E4%BA%AB%E5%9B%BE%403x.png'
+					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
 				}
 			},
 			goIndex(){

pages/user/order/order-details.vue

@@ -202,7 +202,7 @@
 				return {
 					title: '您有新的分享订单，快来查看吧~',
 					path: `/pages/user/order/orderShareLogin?orderID=${this.orderID}&userID=${this.userID}`,
-					imageUrl:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/03/%E8%AE%A2%E5%8D%95%E5%88%86%E4%BA%AB%E5%9B%BE%403x.png'
+					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
 				}
 			},
 			getHeaderTopHeight(){

pages/user/order/order-list.vue

@@ -366,7 +366,7 @@
 				return {
 					title: '您有新的分享订单，快来查看吧~',
 					path: `/pages/user/order/orderShareLogin?orderID=${this.btnoRderID}&userID=${this.userID}`,
-					imageUrl:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/03/%E8%AE%A2%E5%8D%95%E5%88%86%E4%BA%AB%E5%9B%BE%403x.png'
+					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
 				}
 			},
 			//订单状态文字和颜色