commit -m 协销添加机构资料

pages/seller/login/apply.vue

@@ -227,7 +227,7 @@
 					</radio-group>
 				</view>
 			</view>
-			<view class="register-row clearfix" v-show="isDepartment">
+			<view class="register-row clearfix" v-show="isOrganizationType == 1 && isDepartment">
 				<view class="register-from">
 					<view class="label">科室:</view>
 					<input

pages/seller/login/information.vue

@@ -155,6 +155,16 @@
 					</radio-group>
 				</view>
 			</view>
+			<view class="register-row clearfix" v-if="isOrganizationType == 2">
+				<view class="register-from radio">
+					<radio-group @change="radioChange">
+						<label class="row-input" v-for="(item, index) in beautyLists" :key="item.value">
+							<radio class="row-radio" :value="item.value" :checked="index === current" color="#E15616"/>
+							<view class="row-text">{{item.name}}</view>
+						</label>
+					</radio-group>
+				</view>
+			</view>
 			<view class="register-row clearfix" v-show="isDepartment">
 				<view class="register-from">
 					<view class="label">科室:</view>
@@ -248,10 +258,10 @@
 </template>
 
 <script>
-	import { mapMutations } from 'vuex';
+	import { mapMutations } from 'vuex'
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
-	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/json/data.json.js' //本地数据
-	import { uploadFileImage } from "@/services/public.js" 
+	import { beautyList,beautyLists,mentuzCampNullList,medicaCampNullList } from '@/common/json/data.json.js' //本地数据
+	import { uploadFileImage } from '@/services/public.js' 
 	export default{
 		components:{
 			mpvueCityPicker
@@ -295,6 +305,7 @@
 				isOrganizationType:0,
 				organizationTypeText:'请选择机构类型',
 				beautyList:beautyList,
+				beautyLists:beautyLists,
 				mentuzCampNullList:mentuzCampNullList,
 				medicaCampNullList:medicaCampNullList,
 				mentuzCampList:[],
@@ -324,7 +335,7 @@
 				this.$util.modal('','确定放弃本次修改吗？','确定','取消',true,() =>{
 					uni.navigateBack({
 						delta: 1
-					});
+					})
 				})
 			},
 			organizationInfo(){
@@ -374,17 +385,17 @@
 						case 1:
 							this.organizationTypeText = '医美'
 							this.isOrganizationType = 1
-							break;
+							break
 						case 2:
 							this.organizationTypeText = '生美'
 							this.isOrganizationType = 2
-							break;
+							break
 						case null:
 							this.organizationTypeText = '请选择机构类型'
 							this.isOrganizationType = 0
-							break;
+							break
 					}	
-					if(organizationClub.mainProduct == "" || organizationClub.mainProduct == null){
+					if(organizationClub.mainProduct == '' || organizationClub.mainProduct == null){
 						this.mentuzCampList = this.mentuzCampNullList
 						this.medicaCampList = this.medicaCampNullList
 					}else{
@@ -398,9 +409,9 @@
 					}
 					//机构类型
 					switch(this.secondClubType){
-						case 1:this.current = 0;break;
-						case 2:this.current = 1;this.isDepartment=true;break;
-						case 3:this.current = 2;this.isDepartment=true;break;
+						case 1:this.current = 0;break
+						case 2:this.current = 1;this.isDepartment=true;break
+						case 3:this.current = 2;this.isDepartment=true;break
 					}
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
@@ -449,10 +460,10 @@
 					setTimeout(()=>{
 						uni.navigateBack({
 							delta: 1
-						});
+						})
 					},2000)
 				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
+					this.$util.msg(error.msg,2000)
 				})
 			},
 			// 三级联动选择
@@ -461,13 +472,13 @@
 				this.$refs.mpvueCityPicker.show()
 			},
 			onConfirm(e) {
-				this.addressData.address = e.name;
-				this.addressData.townId = e.townCode;
-				this.addressData.cityId = e.cityCode;
-				this.addressData.provinceId = e.provinceCode;
+				this.addressData.address = e.name
+				this.addressData.townId = e.townCode
+				this.addressData.cityId = e.cityCode
+				this.addressData.provinceId = e.provinceCode
 			},	
 			onTextareaInput(e){
-			   this.addressData.addressDetail = e.detail.value;
+			   this.addressData.addressDetail = e.detail.value
 			},
 			showTextareaFocus(){//文本框获取焦点
 				this.isShowInput = false
@@ -478,7 +489,7 @@
 				this.textareaFocus = false
 			},
 			onTextareaInputInfo(e){
-			   this.companyPprofile = e.detail.value;
+			   this.companyPprofile = e.detail.value
 			},
 			chooseBusinessImage() {//营业执照图片上传
 				uploadFileImage().then(res =>{
@@ -511,7 +522,7 @@
 				uni.previewImage({
 					urls: mentuzArray,
 					current: 0
-				});
+				})
 			},
 			delBusinessImage(){
 				this.$util.modal('','确定删除营业执照图片吗？','确定','取消',true,() =>{
@@ -538,10 +549,10 @@
 						switch(e.tapIndex){
 							case 0:
 								this.organizationTypeText = '医美'
-								break;
+								break
 							case 1:
 								this.organizationTypeText = '生美'
-								break;
+								break
 						}
 					}
 				})
@@ -552,7 +563,7 @@
 				this.isOrganizationType = e.target.value
 			},
 			radioChange(e) {
-				this.secondClubType = e.target.value;
+				this.secondClubType = e.target.value
 				if( this.secondClubType == 2 || this.secondClubType == 3){
 					this.isDepartment = true
 				}else{
@@ -560,8 +571,8 @@
 				}
 				for (let i = 0; i < this.beautyList.length; i++) {
 					if (this.beautyList[i].value === this.secondClubType) {
-						this.current = i;
-						break;
+						this.current = i
+						break
 					}
 				}
 			},

pages/seller/remarks/add.vue

@@ -7,7 +7,7 @@
 			<view class="remarks-textarea">
 				<textarea
 					class="textarea"
-					v-model="remarksParams.note"
+					v-model="remarksParams.remarks"
 					value=""
 					placeholder="文字备注，500字以内"
 					maxlength="500"
@@ -46,7 +46,7 @@
 			<view class="list-view" v-for="(file, fileIndex) in remarksParams.fileList" :key="fileIndex">
 				<view class="list-view-text">
 					<view class="input">{{ file.fileName }}</view>
-					<view class="delbtn" @click.stop="deleteFileFn(item.fileList, index)">删除</view>
+					<view class="delbtn" @click.stop="deleteFileFn(remarksParams.fileList, fileIndex)">删除</view>
 				</view>
 			</view>
 			<view class="list-view">
@@ -73,142 +73,72 @@ export default {
 			logisticsBatchId: 0,
 			productActions: [],
 			remarksParams: {
-				note: '',
+				clubId: 0,
+				remarks: '',
 				fileList: [],
-				imageList: []
+				imageList: [],
+				serviceProviderId: 0
 			},
 			min: 0,
-			max: 500
+			max: 500,
+			handleType:''
 		}
 	},
 	onLoad(option) {
 		console.log(option)
-		if (option.type == 'add') {
-			this.logisticsBatchId = option.logisticsBatchId
-			this.shopOrderId = option.shopOrderId
-			this.GetSupplierLogisticsRecord()
+		if (option.type == 'edit') {
+			this.getUserClubRemarksDetail(option.remarksId)
+			this.handleType = option.type
 		} else {
-			this.logisticsBatchId = option.logisticsBatchId
-			this.shopOrderId = option.shopOrderId
-			this.GetSupplierLogisticsRecord()
-			this.GetSupplierQualificationData()
+			this.initGetStotage()
 		}
 	},
 	methods: {
 		...mapMutations(['login']),
-		GetSupplierQualificationData() {
-			//编辑回显商品资质信息
-			this.ShopService.GetSupplierQualificationData({
-				logisticsBatchId: this.logisticsBatchId
-			})
-				.then(response => {
-					const data = response.data
-					if (data && data.length > 0) {
-						this.qualificationsList = data
-						this.isEmpty = false
-					} else {
-						this.isEmpty = true
-					}
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
+		async initGetStotage() {
+			const clubInfo = await this.$api.getComStorage('orderUserInfo')
+			const userInfo = await this.$api.getStorage()
+			this.remarksParams.clubId = clubInfo.clubID ? clubInfo.clubID : 0
+			this.remarksParams.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
 		},
-		GetSupplierLogisticsRecord() {
-			//添加商品资质初始化查询商品信息
-			this.ShopService.GetSupplierLogisticsRecord({
-				logisticsBatchId: this.logisticsBatchId
+		getUserClubRemarksDetail(remarksId) {
+			//修改回显资料备注信息
+			this.UserService.getUserClubRemarksDetail({
+				remarksId : remarksId
 			})
 				.then(response => {
-					const data = response.data
-					data.forEach((el, index) => {
-						let obj = {
-							value: el.id,
-							name: el.productName
-						}
-						this.productActions.push(obj)
-					})
+					let data = response.data
+					this.remarksParams.remarks = data.remarks
+					this.remarksParams.remarksId = data.remarksId
+					this.remarksParams.fileList = data.fileList
+					this.remarksParams.imageList = data.imageList
+					this.initGetStotage()
 				})
 				.catch(error => {
 					this.$util.msg(error.msg, 2000)
 				})
 		},
 		editButtonConfim() {
-			//确定
-			// 校验物流公司不能为空
-			let isRecordId = false
-			let isSnCode = false
-			let isFileList = false
-			let isImageList = false
-			let params = [] //参数
-			this.qualificationsList.forEach((el, index) => {
-				if (el.recordId == '') {
-					isRecordId = true
-				}
-				if (el.sn == '') {
-					isSnCode = true
-				}
-				if (el.fileList == '') {
-					isFileList = true
-				}
-				if (el.imageList == '') {
-					isImageList = true
-				}
-				let paramsObject = {
-					recordId: el.recordId,
-					sn: el.sn,
-					files: el.fileList,
-					images: el.imageList
-				}
-				params.push(paramsObject)
-			})
-			if (isRecordId) {
-				this.$util.msg('请选择商品', 2000)
+			//保存资料备注
+			if (this.remarksParams.remarks == '') {
+				this.$util.msg('请输入文字备注', 2000)
 				return
 			}
-			if (isSnCode) {
-				this.$util.msg('请输入商品SN码', 2000)
-				return
-			}
-			if (isFileList && isImageList) {
-				this.$util.msg('请上传商品资质文件', 2000)
-				return
-			}
-			console.log('params========>', params)
-			this.ShopService.GetSupplierQualificationUpdata({
-				params: JSON.stringify(params)
+			console.log('remarksParams',this.remarksParams)
+			console.log('remarksParams',JSON.stringify(this.remarksParams))
+			this.UserService.getUserClubRemarksSave({
+				params: JSON.stringify(this.remarksParams)
 			})
 				.then(response => {
-					this.$util.msg('保存成功', 3000, true, 'success')
+					this.$util.msg('添加成功', 3000, true, 'success')
 					setTimeout(() => {
-						this.$api.navigateTo(`/pages/supplier/deliver/deliver-record?shopOrderId=${this.shopOrderId}`)
+						this.$api.navigateTo('/pages/seller/remarks/list')
 					}, 2000)
 				})
 				.catch(error => {
 					this.$util.msg(error.msg, 2000)
 				})
 		},
-		bindPickerChange: function(item, e) {
-			//选择筛选条件
-			item.recordId = this.productActions[e.target.value].value
-			item.productName = this.productActions[e.target.value].name
-		},
-		addListFn() {
-			//添加
-			let obj = {
-				productName: '',
-				recordId: '',
-				sn: '',
-				fileList: [],
-				imageList: []
-			}
-			this.qualificationsList.push(obj)
-		},
-		deleteLogistItemFn(item, index) {
-			this.$util.modal('提示', '确认删除物流信息吗？', '确定', '取消', true, () => {
-				this.qualificationsList.splice(index, 1)
-			})
-		},
 		uploadFile(array) {
 			//上传资质文件
 			console.log(array)
@@ -229,6 +159,7 @@ export default {
 			})
 		},
 		deleteFileFn(array, index) {
+			console.log(array)
 			//删除文件
 			this.UploadService.PostFileDelete({
 				ossName: array[index].ossName
@@ -278,7 +209,7 @@ page {
 	width: 100%;
 	height: auto;
 	box-sizing: border-box;
-	padding:0 24rpx;
+	padding: 0 24rpx;
 	.list-view-title {
 		width: 100%;
 		height: auto;
@@ -303,7 +234,7 @@ page {
 		width: 100%;
 		height: 340rpx;
 		padding: 16rpx;
-		margin: 20rpx 0 0 0 ;
+		margin: 20rpx 0 0 0;
 		border-radius: 6rpx;
 		position: relative;
 		border: 1px solid #b2b2b2;
@@ -327,7 +258,7 @@ page {
 	}
 	.list-view {
 		width: 100%;
-		height: auto;
+		height: 40rpx;
 		margin-top: 20rpx;
 		.list-view-file {
 			width: 132rpx;
@@ -359,12 +290,12 @@ page {
 				float: left;
 			}
 			.delbtn {
-				width:96rpx;
+				width: 96rpx;
 				height: 44rpx;
 				border-radius: 8rpx;
-				background-color: #FFF2EC;
+				background-color: #fff2ec;
 				font-size: $font-size-24;
-				color: #E15616;
+				color: #e15616;
 				line-height: 44rpx;
 				text-align: center;
 				float: left;

pages/seller/remarks/details.vue

@@ -2,9 +2,9 @@
 	<view class="container qualifications" :style="{ paddingBottom: isIphoneX ? '68rpx' : '0' }">
 		<view class="remarks-content">
 			<view class="list-view-title"> <view class="list-view-h1">文字备注</view> </view>
-			<view class="remarks-textarea"> {{ remarksParams.note }} </view>
-			<view class="list-view-title"> <view class="list-view-h1">上传图片</view> </view>
-			<view class="list-view-upload clearfix">
+			<view class="remarks-textarea"> {{ remarksParams.remarks }} </view>
+			<view class="list-view-title" v-if="remarksParams.imageList.length>0"> <view class="list-view-h1">图片</view> </view>
+			<view class="list-view-upload clearfix" v-if="remarksParams.imageList.length>0">
 				<view class="photo-item" v-for="(image, imageIndex) in remarksParams.imageList" :key="imageIndex">
 					<image
 						:src="image"
@@ -13,10 +13,11 @@
 					></image>
 				</view>
 			</view>
-			<view class="list-view-title"> <view class="list-view-h1">上传文件</view> </view>
-			<view class="list-view" v-for="(file, fileIndex) in remarksParams.fileList" :key="fileIndex">
+			<view class="list-view-title" v-if="remarksParams.fileList.length>0"> <view class="list-view-h1">文件</view> </view>
+			<view class="list-view" v-for="(file, fileIndex) in remarksParams.fileList" :key="fileIndex" v-if="remarksParams.fileList.length>0">
 				<view class="list-view-text">
-					<view class="input">{{ file.name }}</view>
+					<view class="input">{{ file.fileName }}</view>
+					<view class="delbtn" @click.stop="previewFile(file)">预览</view>
 				</view>
 			</view>
 		</view>
@@ -33,206 +34,30 @@ export default {
 	data() {
 		return {
 			isIphoneX: this.$store.state.isIphoneX,
-			shopOrderId: 0,
-			logisticsBatchId: 0,
 			productActions: [],
-			remarksParams: {
-				note:
-					'本期采美网给大家带来重磅消息：中国医美知名上游品牌半岛医疗正式入驻采美啦！！！本期采美网给大家带来重磅消息：中国医美知名上游品牌半岛医疗正式入驻采美啦！！！本期采美网给大家带来重磅消息：中国医美知名上游品牌半岛医疗正式入驻采美啦！！！本期采美网给大家带来重磅消息：中国医美知名上游品牌半岛医疗正式入驻采美啦！！！本期采美网给大家带来重磅消息：中国医美知名上游品牌半岛医疗正式入驻采美啦！！！本期采美网给大家带来重磅消息：中国医美知名上游品牌半岛医疗正式入驻采美啦！！！本期采美网给大家带来重磅消息：中国医美知名上游品牌半岛医疗正式入驻采美啦！！！本期采美网给大家带来重磅消息本期采美网给大家带来重磅消息本期采美网给大家带来重磅消息本期采美网给大家带来重磅消息本期采美网给大家带来重磅消息本期采美网给大家带来重磅消息：中国医美知名上游品牌半岛医疗正式入驻采美啦！！！',
-				fileList: [
-					{
-						name: '任正非：除了胜利，我们已无路可走.pdf',
-					},
-					{
-						name: '任正非：除了胜利，我们已无路可走.pdf',
-					},
-					{
-						name: '任正非：除了胜利，我们已无路可走.pdf',
-					},
-					{
-						name: '任正非：除了胜利，我们已无路可走.pdf',
-					},
-				],
-				imageList: [
-					'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
-					'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
-					'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
-					'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
-					'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
-					'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
-					'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
-					'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
-					'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
-					'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png'
-				]
-			},
-			min: 0,
-			max: 500
+			remarksParams: {},
+			remarksId:0
 		}
 	},
 	onLoad(option) {
 		console.log(option)
-		if (option.type == 'add') {
-			this.logisticsBatchId = option.logisticsBatchId
-			this.shopOrderId = option.shopOrderId
-			this.GetSupplierLogisticsRecord()
-		} else {
-			this.logisticsBatchId = option.logisticsBatchId
-			this.shopOrderId = option.shopOrderId
-			this.GetSupplierLogisticsRecord()
-			this.GetSupplierQualificationData()
-		}
+		this.remarksId = option.remarksId
+		this.getUserClubRemarksDetail()
 	},
 	methods: {
 		...mapMutations(['login']),
-		GetSupplierQualificationData() {
-			//编辑回显商品资质信息
-			this.ShopService.GetSupplierQualificationData({
-				logisticsBatchId: this.logisticsBatchId
-			})
-				.then(response => {
-					const data = response.data
-					if (data && data.length > 0) {
-						this.qualificationsList = data
-						this.isEmpty = false
-					} else {
-						this.isEmpty = true
-					}
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
-		},
-		GetSupplierLogisticsRecord() {
-			//添加商品资质初始化查询商品信息
-			this.ShopService.GetSupplierLogisticsRecord({
-				logisticsBatchId: this.logisticsBatchId
-			})
-				.then(response => {
-					const data = response.data
-					data.forEach((el, index) => {
-						let obj = {
-							value: el.id,
-							name: el.productName
-						}
-						this.productActions.push(obj)
-					})
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
-		},
-		editButtonConfim() {
-			//确定
-			// 校验物流公司不能为空
-			let isRecordId = false
-			let isSnCode = false
-			let isFileList = false
-			let isImageList = false
-			let params = [] //参数
-			this.qualificationsList.forEach((el, index) => {
-				if (el.recordId == '') {
-					isRecordId = true
-				}
-				if (el.sn == '') {
-					isSnCode = true
-				}
-				if (el.fileList == '') {
-					isFileList = true
-				}
-				if (el.imageList == '') {
-					isImageList = true
-				}
-				let paramsObject = {
-					recordId: el.recordId,
-					sn: el.sn,
-					files: el.fileList,
-					images: el.imageList
-				}
-				params.push(paramsObject)
-			})
-			if (isRecordId) {
-				this.$util.msg('请选择商品', 2000)
-				return
-			}
-			if (isSnCode) {
-				this.$util.msg('请输入商品SN码', 2000)
-				return
-			}
-			if (isFileList && isImageList) {
-				this.$util.msg('请上传商品资质文件', 2000)
-				return
-			}
-			console.log('params========>', params)
-			this.ShopService.GetSupplierQualificationUpdata({
-				params: JSON.stringify(params)
+		getUserClubRemarksDetail() {
+			//资料详情
+			this.UserService.getUserClubRemarksDetail({
+				remarksId: this.remarksId
 			})
 				.then(response => {
-					this.$util.msg('保存成功', 3000, true, 'success')
-					setTimeout(() => {
-						this.$api.navigateTo(`/pages/supplier/deliver/deliver-record?shopOrderId=${this.shopOrderId}`)
-					}, 2000)
+					this.remarksParams = response.data
 				})
 				.catch(error => {
 					this.$util.msg(error.msg, 2000)
 				})
 		},
-		bindPickerChange: function(item, e) {
-			//选择筛选条件
-			item.recordId = this.productActions[e.target.value].value
-			item.productName = this.productActions[e.target.value].name
-		},
-		addListFn() {
-			//添加
-			let obj = {
-				productName: '',
-				recordId: '',
-				sn: '',
-				fileList: [],
-				imageList: []
-			}
-			this.qualificationsList.push(obj)
-		},
-		deleteLogistItemFn(item, index) {
-			this.$util.modal('提示', '确认删除物流信息吗？', '确定', '取消', true, () => {
-				this.qualificationsList.splice(index, 1)
-			})
-		},
-		uploadFile(array) {
-			//上传资质文件
-			console.log(array)
-			uploadFilePdfDocDocx().then(res => {
-				let data = JSON.parse(res.data).data
-				let obj = {
-					fileName: uni.getStorageSync('fileName'),
-					ossName: data.ossName
-				}
-				array.push(obj)
-				console.log('array', array)
-			})
-		},
-		uploadPhotoFn(array) {
-			//添加图片
-			uploadFileImage().then(res => {
-				array.push(JSON.parse(res.data).data)
-			})
-		},
-		deleteFileFn(array, index) {
-			//删除文件
-			this.UploadService.PostFileDelete({
-				ossName: array[index].ossName
-			})
-				.then(res => {
-					array.splice(index, 1)
-				})
-				.catch(error => {
-					console.log('删除文件异常提示===>', error.msg)
-				})
-		},
-		deletePhotoFn(array, index) {
-			//删除图片
-			array.splice(index, 1)
-		},
 		previewImg(image, index) {
 			//顶部商品图片预览
 			isPreviewImg = true
@@ -243,15 +68,55 @@ export default {
 				longPressActions: ''
 			})
 		},
-		conInput(e) {
-			//备注文字字数限制
-			let value = e.detail.value
-			let len = parseInt(value.length)
-			if (len > this.max) return
-			this.min = len
-			if (this.min == 200) {
-				this.$util.msg('您输入的字数已达上限', 2000)
-			}
+		previewFile(file){//预览文件
+			this.openDocument(file)
+		},
+		openDocument(file) {// 打开文档
+		    uni.showLoading({
+		        title:'加载中'
+		    })
+		    // 获取文件后缀
+		    const index = file.fileName.lastIndexOf('.')
+		    const suffix = file.fileName.substring(index + 1)
+		    // 下载文件
+		    uni.downloadFile({
+		        url: file.fileUrl,
+		        success(res) {
+		            const filePath = res.tempFilePath
+		            console.log(filePath) 
+		            // 打开文件
+		            uni.openDocument({
+		                filePath: filePath,
+		                fileType: suffix,
+		                success(res) {
+		                    uni.showToast({
+		                        icon:'success',
+		                        title:'打开成功',
+		                        duration: 1200
+		                    })
+		                    uni.hideLoading()
+		                },
+		                fail(err) {
+		                    if(err.errMsg.indexOf('fail filetype not supported')){
+		                        uni.showModal({
+		                            content: '不支持的文件预览',
+		                            cancelColor: '#666',
+		                            confirmColor: '#E15616'
+		                        })
+		                    }
+		                    uni.hideLoading()
+		                }
+		            })
+		        },
+		        fail(err){
+		            uni.showToast({
+		                title: JSON.stringify(err),
+		                icon:'none',
+		                duration: 5000
+		            })
+		            uni.hideLoading()
+		        },
+		    })
 		}
 	},
 	onShow() {}
@@ -316,6 +181,17 @@ page {
 				float: left;
 				font-size: 26rpx;
 			}
+			.delbtn{
+				width: 96rpx;
+				height: 44rpx;
+				border-radius: 8rpx;
+				background-color: #fff2ec;
+				font-size: $font-size-24;
+				color: #e15616;
+				line-height: 44rpx;
+				text-align: center;
+				float: left;
+			}
 		}
 	}
 	.list-view-upload {

pages/seller/remarks/list.vue

@@ -8,11 +8,12 @@
 					<text class="error-text">暂无任何资料备注~</text>
 				</view>
 				<!-- 列表 -->
-				<view class="tui-remarks-cell  tui-mtop" v-for="(remark, index) in remarksList" :key="index" @click.stop="details(remark)">
-					<view class="tui-remarks-time">{{ remark.time }}</view>
-					<view class="tui-remarks-content">{{ remark.content }}</view>
+				<view class="tui-remarks-cell  tui-mtop" v-for="(remark, index) in remarksList" :key="index" @click.stop="details(remark.remarksId)">
+					<view class="tui-remarks-time">{{ remark.addTime }}</view>
+					<view class="tui-remarks-content">{{ remark.remarks }}</view>
 					<view class="tui-remarks-button">
-						<view class="btn">修改</view> <view class="btn" @click="deleteRemark(remark)">删除</view>
+						<view class="btn"  @click.stop="handEditRemark(remark.remarksId)">修改</view> 
+						<view class="btn" @click.stop="deleteRemark(remark.remarksId)">删除</view>
 					</view>
 				</view>
 				<!--加载loadding-->
@@ -52,7 +53,7 @@ import tuiNomore from '@/components/tui-components/nomore/nomore'
 
 import { mapState, mapMutations } from 'vuex'
 const defaultListQuery = {
-	userId: 0,
+	clubId: 0,
 	pageNum: 1,
 	pageSize: 10
 }
@@ -83,68 +84,10 @@ export default {
 			totalRecord: 0,
 			popupShow: true,
 			popupShow1: false,
-			isProductChecked: false,
 			listQuery: Object.assign({}, defaultListQuery),
-			remarksList: [
-				{
-					time: '2021.09.07  16:20:10',
-					content:
-						'半岛超声炮是目前国内唯一一台获得NMPA认证的“国产超声刀”，采用大焦域和超脉冲技术的方式，利用超声波能量精准加热皮下SMAS筋膜层、真皮层、浅脂肪层...'
-				},
-				{
-					time: '2021.09.07  16:20:10',
-					content:
-						'半岛超声炮是目前国内唯一一台获得NMPA认证的“国产超声刀”，采用大焦域和超脉冲技术的方式，利用超声波能量精准加热皮下SMAS筋膜层、真皮层、浅脂肪层...'
-				},
-				{
-					time: '2021.09.07  16:20:10',
-					content:
-						'半岛超声炮是目前国内唯一一台获得NMPA认证的“国产超声刀”，采用大焦域和超脉冲技术的方式，利用超声波能量精准加热皮下SMAS筋膜层、真皮层、浅脂肪层...'
-				},
-				{
-					time: '2021.09.07  16:20:10',
-					content:
-						'半岛超声炮是目前国内唯一一台获得NMPA认证的“国产超声刀”，采用大焦域和超脉冲技术的方式，利用超声波能量精准加热皮下SMAS筋膜层、真皮层、浅脂肪层...'
-				},
-				{
-					time: '2021.09.07  16:20:10',
-					content:
-						'半岛超声炮是目前国内唯一一台获得NMPA认证的“国产超声刀”，采用大焦域和超脉冲技术的方式，利用超声波能量精准加热皮下SMAS筋膜层、真皮层、浅脂肪层...'
-				},
-				{
-					time: '2021.09.07  16:20:10',
-					content:
-						'半岛超声炮是目前国内唯一一台获得NMPA认证的“国产超声刀”，采用大焦域和超脉冲技术的方式，利用超声波能量精准加热皮下SMAS筋膜层、真皮层、浅脂肪层...'
-				},
-				{
-					time: '2021.09.07  16:20:10',
-					content:
-						'半岛超声炮是目前国内唯一一台获得NMPA认证的“国产超声刀”，采用大焦域和超脉冲技术的方式，利用超声波能量精准加热皮下SMAS筋膜层、真皮层、浅脂肪层...'
-				},
-				{
-					time: '2021.09.07  16:20:10',
-					content:
-						'半岛超声炮是目前国内唯一一台获得NMPA认证的“国产超声刀”，采用大焦域和超脉冲技术的方式，利用超声波能量精准加热皮下SMAS筋膜层、真皮层、浅脂肪层...'
-				},
-				{
-					time: '2021.09.07  16:20:10',
-					content:
-						'半岛超声炮是目前国内唯一一台获得NMPA认证的“国产超声刀”，采用大焦域和超脉冲技术的方式，利用超声波能量精准加热皮下SMAS筋膜层、真皮层、浅脂肪层...'
-				},
-				{
-					time: '2021.09.07  16:20:10',
-					content:
-						'半岛超声炮是目前国内唯一一台获得NMPA认证的“国产超声刀”，采用大焦域和超脉冲技术的方式，利用超声波能量精准加热皮下SMAS筋膜层、真皮层、浅脂肪层...'
-				}
-			],
-			handleData: {},
-			number: 0,
-			buyRetailPrice: 0,
-			buyRetailPriceStep: 1,
-			isQuantity: false,
+			remarksList: [],
 			scrollTop: 0,
 			isEmpty: false,
-			isAllChecked: false,
 			loadding: false,
 			pullUpOn: true,
 			pullFlag: true,
@@ -153,11 +96,11 @@ export default {
 			nomoreText: '上拉显示更多',
 			contentModalText: '', //操作文字提示语句
 			modal: false,
-			userIdentity: 0
+			handleRemarksId:0
 		}
 	},
 	onLoad() {
-		// this.initGetStotage()
+		
 	},
 	filters: {
 		NumFormat: function(value) {
@@ -173,22 +116,21 @@ export default {
 	methods: {
 		...mapMutations(['login', 'logout']),
 		async initGetStotage() {
-			const userInfo = await this.$api.getStorage()
-			this.listQuery.userId = userInfo.userId ? userInfo.userId : 0
-			this.userIdentity = userInfo.userIdentity ? userInfo.userIdentity : 0
+			const clubInfo = await this.$api.getComStorage('orderUserInfo')
+			this.listQuery.clubId = clubInfo.clubID ? clubInfo.clubID : 0
 			this.GetProductListInfo()
 		},
 		GetProductListInfo() {
-			this.productList = []
+			this.remarksList = []
 			this.listQuery.pageNum = 1
-			this.ProductService.getProductUserLikeList(this.listQuery)
+			this.UserService.getUserClubRemarksList(this.listQuery)
 				.then(response => {
 					let data = response.data
 					if (data.results && data.results.length > 0) {
 						this.isEmpty = false
 						this.hasNextPage = data.hasNextPage
 						this.totalRecord = data.totalRecord
-						this.productList = data.results
+						this.remarksList = data.results
 						this.pullFlag = false
 						setTimeout(() => {
 							this.pullFlag = true
@@ -197,7 +139,7 @@ export default {
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
 						} else {
-							if (this.productList.length < 8) {
+							if (this.remarksList.length < 8) {
 								this.pullUpOn = true
 							} else {
 								this.pullUpOn = false
@@ -217,12 +159,12 @@ export default {
 		GetOnReachBottomData(index) {
 			//上拉加载
 			this.listQuery.pageNum += 1
-			this.ProductService.getProductUserLikeList(this.listQuery)
+			this.UserService.getUserClubRemarksList(this.listQuery)
 				.then(response => {
 					let data = response.data
 					if (data.results && data.results.length > 0) {
 						this.hasNextPage = data.hasNextPage
-						this.productList = this.productList.concat(data.results)
+						this.remarksList = this.remarksList.concat(data.results)
 						this.pullFlag = false // 防上拉暴滑
 						setTimeout(() => {
 							this.pullFlag = true
@@ -241,10 +183,15 @@ export default {
 					this.$util.msg(error.msg, 2000)
 				})
 		},
-		deleteRemark() {
+		deleteRemark(remarksId) {
+			this.handleRemarksId = remarksId
 			this.modal = true
 			this.contentModalText = '确定删除这条备注信息吗？'
 		},
+		handEditRemark(remarksId){
+			//跳转修改资料备注
+			this.$api.navigateTo(`/pages/seller/remarks/add?type=edit&remarksId=${remarksId}`)
+		},
 		handleAllUnder() {
 			//跳转添加资料备注
 			this.$api.navigateTo('/pages/seller/remarks/add')
@@ -257,13 +204,12 @@ export default {
 			this.modal = false
 		},
 		handleDeleteUserLike() {
-			//操作取消收藏
-			this.ProductService.getDeleteUserLike({
-				productIds: this.productIds,
-				userId: this.listQuery.userId
+			//操作删除资料备注
+			this.UserService.getUserClubRemarksDelete({
+				remarksId: this.handleRemarksId
 			})
 				.then(response => {
-					this.$util.msg('取消收藏成功', 2000, true, 'success')
+					this.$util.msg('删除成功', 2000, true, 'success')
 					setTimeout(() => {
 						this.GetProductListInfo()
 					}, 2000)
@@ -275,166 +221,8 @@ export default {
 		hideMobel() {
 			this.modal = false
 		},
-		updateCheckAllBtn() {
-			//勾选单个判断全选
-			let goodsCheckedLength = 0
-			this.productList.forEach(item => {
-				if (item.isChecked) {
-					goodsCheckedLength++
-				}
-			})
-			this.isAllChecked = goodsCheckedLength === this.productList.length
-			if (goodsCheckedLength > 0) {
-				this.isProductChecked = true
-			} else {
-				this.isProductChecked = false
-			}
-		},
-		updateBothCheckBtn() {
-			//全选勾选判断
-			this.productList.forEach(item => {
-				item.isChecked = this.isAllChecked
-			})
-		},
-		isCheckedAll() {
-			//全选
-			this.isAllChecked = !this.isAllChecked
-			if (this.isAllChecked) {
-				this.isProductChecked = true
-			} else {
-				this.isProductChecked = false
-			}
-			this.updateBothCheckBtn()
-		},
-		checkedSoperv(item) {
-			//选择
-			item.isChecked = !item.isChecked
-			console.log(item)
-			this.updateCheckAllBtn()
-		},
-		PromotionsFormat(promo) {
-			//促销活动类型数据处理
-			if (promo != null) {
-				if (promo.type == 1 && promo.mode == 1) {
-					return true
-				} else {
-					return false
-				}
-			}
-			return false
-		},
-		changeCountAdd() {
-			//popup弹窗数量增加按钮
-			if (this.buyRetailPriceStep == 2) {
-				this.number += this.minBuyNumber
-			} else {
-				this.number++
-			}
-			this.calculatPerice()
-		},
-		changeCountSub() {
-			//popup弹窗数量减按钮
-			if (this.number <= this.minBuyNumber) {
-				this.number = this.minBuyNumber
-				this.isQuantity = true
-				this.$util.msg(`该商品最小起订量为${this.minBuyNumber}`, 2000)
-				return
-			} else {
-				if (this.buyRetailPriceStep == 2) {
-					this.number -= this.minBuyNumber
-				} else {
-					this.number--
-				}
-				this.calculatPerice()
-				this.isQuantity = false
-			}
-		},
-		changeNumber(e) {
-			let _value = e.detail.value
-			if (!this.$api.isNumber(_value)) {
-				this.number = this.minBuyNumber
-			} else if (_value < this.minBuyNumber) {
-				this.$util.msg(`该商品最小起订量为${this.minBuyNumber}`, 2000)
-				this.number = this.minBuyNumber
-			} else if (_value % this.minBuyNumber != 0) {
-				this.$util.msg('购买量必须为起订量的整数倍', 2000)
-				this.number = this.minBuyNumber
-			} else {
-				this.number = e.detail.value
-				this.calculatPerice()
-			}
-		},
-		calculatPerice() {
-			//判断是否为阶梯价然后做计算价格处理
-			if (this.handleData.ladderPriceFlag == 1) {
-				this.handleData.ladderPrices.forEach((item, index) => {
-					if (this.number >= item.buyNum) {
-						this.buyRetailPrice = item.buyPrice
-					}
-				})
-			}
-		},
-		toConfirmation() {
-			//跳转确认订单页面
-			this.popupShow1 = false
-			let productStp = {
-				allPrice: this.number * this.buyRetailPrice,
-				allCount: this.number,
-				productID: this.handleData.productId,
-				productCount: this.number
-			}
-			this.$api.navigateTo(
-				`/pages/user/order/create-order?type=prodcut&data=${JSON.stringify({ data: productStp })}`
-			)
-		},
-		getAddProductCart() {
-			//增加购物车成功和toast弹窗提示成功
-			this.ProductService.shoppingAddCart({
-				productID: this.handleData.productId,
-				userID: this.listQuery.userId,
-				productCount: this.number
-			})
-				.then(response => {
-					this.popupShow1 = false
-					this.$util.msg('加入购物车成功', 1500, true, 'success')
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
-		},
-		showPopup(index, pros) {
-			// 弹窗显示
-			switch (index) {
-				case 0:
-					this.popupShow = true
-					break
-				case 1:
-					this.popupShow1 = true
-					this.handleData = pros
-					console.log(this.handleData)
-					this.buyRetailPrice = this.handleData.price
-					this.buyRetailPriceStep = this.handleData.step
-					if (this.handleData.ladderPriceFlag == 1) {
-						this.number = this.handleData.maxBuyNumber ? this.handleData.maxBuyNumber : 1
-					} else {
-						this.number = this.handleData.minBuyNumber
-					}
-					break
-			}
-		},
-		hidePopup(index) {
-			// 弹窗隐藏
-			switch (index) {
-				case 0:
-					this.popupShow = false
-					break
-				case 1:
-					this.popupShow1 = false
-					break
-			}
-		},
-		details(id) {
-			this.$api.navigateTo(`/pages/seller/remarks/details?id=${id}`)
+		details(remarksId) {
+			this.$api.navigateTo(`/pages/seller/remarks/details?remarksId=${remarksId}`)
 		}
 	},
 	onPageScroll(e) {
@@ -453,7 +241,9 @@ export default {
 			uni.stopPullDownRefresh()
 		}, 200)
 	},
-	onShow() {}
+	onShow() {
+		this.initGetStotage()
+	}
 }
 </script>
 
@@ -497,7 +287,7 @@ page {
 		.tui-remarks-content {
 			width: 100%;
 			line-height: 44rpx;
-			text-align: left;
+			text-align: justify;
 			font-size: $font-size-26;
 			color: #333333;
 			text-overflow: ellipsis;

pages/supplier/deliver/deliver-record.vue

@@ -1,491 +1,532 @@
 <template>
-	<view class="container record clearfix" :style="{paddingTop:CustomBar+'px'}"> 
-		<cd-custom :systeminfo='systeminfo' :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" :page='1' @pageDetails="hanldPageDetails"></cd-custom>
-		<view class="record-content-empty" v-if="isEmpty" :style="{'height': windowHeight ? windowHeight - CustomBar+'px' : 'auto'}">
+	<view class="container record clearfix" :style="{ paddingTop: CustomBar + 'px' }">
+		<cd-custom
+			:systeminfo="systeminfo"
+			:navbar-data="nvabarData"
+			:headerBtnPosi="headerBtnPosi"
+			:page="1"
+			@pageDetails="hanldPageDetails"
+		></cd-custom>
+		<view
+			class="record-content-empty"
+			v-if="isEmpty"
+			:style="{ height: windowHeight ? windowHeight - CustomBar + 'px' : 'auto' }"
+		>
 			<view class="record-container clearfix">
-				<image class="club-empty-image" src="https://img.caimei365.com/group1/M00/03/B7/Cmis2178OfaAEjhLAABqsz9OXM0847.png" mode="aspectFit"></image>
-				<view class="txt">此订单暂无发货记录~</view>
-				<view class="btn" @click="pageGoLink">去发货</view>
+				<image
+					class="club-empty-image"
+					src="https://img.caimei365.com/group1/M00/03/B7/Cmis2178OfaAEjhLAABqsz9OXM0847.png"
+					mode="aspectFit"
+				></image>
+				<view class="txt">此订单暂无发货记录~</view> <view class="btn" @click="pageGoLink">去发货</view>
 			</view>
 		</view>
 		<view class="record-content" v-else>
 			<scroll-view scroll-y="true" class="scroll-view">
-				<view class="record-list clearfix"  v-for="(item,index) in RecordList" :key="index">
+				<view class="record-list clearfix" v-for="(item, index) in RecordList" :key="index">
 					<view class="record-top clearfix">
 						<view class="top-view">
 							<view class="top-viewlabel">发货时间:</view>
-							<view class="top-viewtext">{{item.deliveryTime}}</view>
+							<view class="top-viewtext">{{ item.deliveryTime }}</view>
 						</view>
-						<view class="top-view" v-for="(logist,idx) in item.logisticsInformationList" :key="logist.id">
-							<view class="top-viewlabel">{{logist.logisticsCompanyName}}:</view>
+						<view class="top-view" v-for="(logist, idx) in item.logisticsInformationList" :key="logist.id">
+							<view class="top-viewlabel">{{ logist.logisticsCompanyName }}:</view>
 							<view class="top-viewtext">
-								<text>{{logist.nu}}</text>
+								<text>{{ logist.nu }}</text>
 							</view>
 						</view>
 					</view>
 					<view class="goods-pros">
-						<view class="goods-pros-t" v-for="(pros,idx) in item.logisticsRecordList" :key="pros.id">
-							<view class="pros-img"><image :src="pros.image ? pros.image:''" alt="" mode="aspectFill"/></view>
+						<view class="goods-pros-t" v-for="(pros, idx) in item.logisticsRecordList" :key="pros.id">
+							<view class="pros-img"
+								><image :src="pros.image ? pros.image : ''" alt="" mode="aspectFill"
+							/></view>
 							<view class="pros-product">
-								<view class="producttitle">{{pros.productName}}</view>
-								<view class="productspec">规格:{{pros.unit ? pros.unit : ''}}</view>
-								<view class="productspec">商品编码:{{pros.productCode ? pros.productCode : ''}}</view>
+								<view class="producttitle">{{ pros.productName }}</view>
+								<view class="productspec">规格:{{ pros.unit ? pros.unit : '' }}</view>
+								<view class="productspec">商品编码:{{ pros.productCode ? pros.productCode : '' }}</view>
 								<view class="product-view">
-									<view class="view-num">数量：{{pros.buyNum}}</view>
+									<view class="view-num">数量：{{ pros.buyNum }}</view>
 								</view>
 								<view class="product-view">
-									<view class="view-num">本次发货：{{pros.num}}</view>
-									<view class="view-num">已发货：{{pros.shipmentsNum}}</view>
+									<view class="view-num">本次发货：{{ pros.num }}</view>
+									<view class="view-num">已发货：{{ pros.shipmentsNum }}</view>
 								</view>
 								<view class="product-view">
-									<view class="view-num">未发货：{{pros.notShippedNum}}</view>
-									<view class="view-num">已退货：{{pros.returnedNum}}</view>
+									<view class="view-num">未发货：{{ pros.notShippedNum }}</view>
+									<view class="view-num">已退货：{{ pros.returnedNum }}</view>
 								</view>
-							</view>	
+							</view>
 						</view>
-						<view class="goods-pros-b clearfix" v-show="item.remarkImages.length>0">
+						<view class="goods-pros-b clearfix" v-show="item.remarkImages.length > 0">
 							<view class="b-label">拍照备注</view>
 							<view class="b-photo">
-								<view class="b-imageView" v-for="(imgItem,imgIdx) in item.remarkImages" :key="imgIdx" >
-									<image :src="imgItem" mode="aspectFill"  @click="previewImg(imgIdx,item.remarkImages)"></image>
+								<view class="b-imageView" v-for="(imgItem, imgIdx) in item.remarkImages" :key="imgIdx">
+									<image
+										:src="imgItem"
+										mode="aspectFill"
+										@click="previewImg(imgIdx, item.remarkImages)"
+									></image>
 								</view>
 							</view>
 						</view>
-						<view class="goods-pros-b clearfix" v-if="item.remark!=''">
+						<view class="goods-pros-b clearfix" v-if="item.remark != ''">
 							<view class="b-label">文字备注</view>
 							<view class="b-photo">
-								<view class="text">{{item.remark ? item.remark : ''}}</view>
+								<view class="text">{{ item.remark ? item.remark : '' }}</view>
 							</view>
 						</view>
 					</view>
 					<!-- 底部button -->
-					<order-button ref="orderButton" 
-								  :hanldData="item" 
-								  @buttonConfirm="handButtonConfirm">
+					<order-button ref="orderButton" :hanldData="item" @buttonConfirm="handButtonConfirm">
 					</order-button>
 				</view>
 				<!--加载loadding-->
 				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText"></tui-nomore>
 				<!--加载loadding-->
-			</scroll-view>	
+			</scroll-view>
 		</view>
 	</view>
 </template>
 <script>
-	import { mapState,mapMutations } from 'vuex';
-	import orderButton from '@/components/cm-module/orderDetails/supplierRecorgButton.vue'	//底部按钮
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import cdCustom from "@/components/cm-custom/custom-d"
-	
-	var isPreviewImg 
-	export default{
-		components:{
-			orderButton,
-			tuiLoadmore,
-			tuiNomore,
-			cdCustom
-		},
-		data(){
-			return{
-				nvabarData: {//顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标   1表示显示    0表示不显示
-					title: '发货记录', // 导航栏 中间的标题
-				},
-				headerBtnPosi:	this.setHeaderBtnPosi(),//获取设备顶部胶囊高度
-				systeminfo:this.setSysteminfo(),		 //获取设备信息
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				isIphoneX:this.$store.state.isIphoneX,
-				listQuery:{
-					shopOrderId:0,
-					pageNum:1,
-					pageSize:10,
-				},
-				lgisList:[],
-				ramkesList:[],
-				RecordList:[],	//发货记录
-				hasNextPage:false,
-				loadding: false,
-				pullUpOn: true,
-				pullFlag: true,
-				isEmpty:false,
-				nomoreText: '上拉显示更多',
-				scrollHeight: '',
-				windowHeight: '',
-				mobile:0
-			}
-		},
-		onLoad(option){
-			this.listQuery.shopOrderId = option.shopOrderId
-			this.setScrollHeight()
-			this.initShopShipmentsRecord();
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo'])
-		},
-		methods:{
-			initShopShipmentsRecord(){//初始化发货记录 index:1
-				this.ShopService.ShopShipmentsRecord(this.listQuery).then(response =>{
+import { mapState, mapMutations } from 'vuex'
+import orderButton from '@/components/cm-module/orderDetails/supplierRecorgButton.vue' //底部按钮
+import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
+import tuiNomore from '@/components/tui-components/nomore/nomore'
+import cdCustom from '@/components/cm-custom/custom-d'
+
+var isPreviewImg
+export default {
+	components: {
+		orderButton,
+		tuiLoadmore,
+		tuiNomore,
+		cdCustom
+	},
+	data() {
+		return {
+			nvabarData: {
+				//顶部自定义导航
+				showCapsule: 1, // 是否显示左上角图标   1表示显示    0表示不显示
+				title: '发货记录' // 导航栏 中间的标题
+			},
+			headerBtnPosi: this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
+			systeminfo: this.setSysteminfo(), //获取设备信息
+			CustomBar: this.CustomBar, // 顶部导航栏高度
+			isIphoneX: this.$store.state.isIphoneX,
+			listQuery: {
+				shopOrderId: 0,
+				pageNum: 1,
+				pageSize: 10
+			},
+			lgisList: [],
+			ramkesList: [],
+			RecordList: [], //发货记录
+			hasNextPage: false,
+			loadding: false,
+			pullUpOn: true,
+			pullFlag: true,
+			isEmpty: false,
+			nomoreText: '上拉显示更多',
+			scrollHeight: '',
+			windowHeight: '',
+			mobile: 0
+		}
+	},
+	onLoad(option) {
+		this.listQuery.shopOrderId = option.shopOrderId
+		this.setScrollHeight()
+		this.initShopShipmentsRecord()
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		initShopShipmentsRecord() {
+			//初始化发货记录 index:1
+			this.ShopService.ShopShipmentsRecord(this.listQuery)
+				.then(response => {
 					console.log(response)
 					let data = response.data
 					let logisticsBatchPage = data.logisticsBatchPage
 					this.mobile = data.userInfo.mobile
-					if(logisticsBatchPage.list&&logisticsBatchPage.list.length > 0){
+					if (logisticsBatchPage.list && logisticsBatchPage.list.length > 0) {
 						this.isEmpty = false
 						this.hasNextPage = logisticsBatchPage.hasNextPage
-						this.RecordList =logisticsBatchPage.list
-						this.pullFlag = false;
-						setTimeout(()=>{this.pullFlag = true;},500)
-						if(this.hasNextPage){
+						this.RecordList = logisticsBatchPage.list
+						this.pullFlag = false
+						setTimeout(() => {
+							this.pullFlag = true
+						}, 500)
+						if (this.hasNextPage) {
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
-						}else{
-							if(this.RecordList.length < 2){
+						} else {
+							if (this.RecordList.length < 2) {
 								this.pullUpOn = true
 								this.loadding = false
-							}else{
+							} else {
 								this.pullUpOn = false
 								this.loadding = false
 								this.nomoreText = '已至底部'
 							}
 						}
-					}else{
+					} else {
 						this.isEmpty = true
 					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
 				})
-			},	
-			getOnReachBottomData(){
-				this.listQuery.pageNum+=1
-				this.ShopService.ShopShipmentsRecord(this.listQuery).then(response =>{
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		getOnReachBottomData() {
+			this.listQuery.pageNum += 1
+			this.ShopService.ShopShipmentsRecord(this.listQuery)
+				.then(response => {
 					let data = response.data.logisticsBatchPage
-					if(data.list&&data.list.length > 0){
+					if (data.list && data.list.length > 0) {
 						this.hasNextPage = data.hasNextPage
-						this.RecordList = this.RecordList.concat(data.list) 
-						this.pullFlag = false;// 防上拉暴滑
-						setTimeout(()=>{this.pullFlag = true;},500)
-						if(this.hasNextPage){
+						this.RecordList = this.RecordList.concat(data.list)
+						this.pullFlag = false // 防上拉暴滑
+						setTimeout(() => {
+							this.pullFlag = true
+						}, 500)
+						if (this.hasNextPage) {
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
-						}else{
+						} else {
 							this.pullUpOn = false
 							this.loadding = false
 							this.nomoreText = '已至底部'
 						}
 					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
 				})
-			},
-			setHeaderBtnPosi(){// 获得胶囊按钮位置信息
-				let headerBtnPosi = uni.getMenuButtonBoundingClientRect();
-				return headerBtnPosi
-			},
-			setSysteminfo(){ // 获取设备信息
-				let systeminfo;
-				uni.getSystemInfo({
-					success: (res) => {
-						systeminfo = res
-					},
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
 				})
-				return systeminfo
-			},
-			setScrollHeight() {
-				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
-				this.windowHeight = windowHeight - 1;
-				this.scrollHeight = windowHeight - 1;
-			},
-			previewImg (index,previewUrls) {//顶部商品图片预览
-				isPreviewImg = true
-				uni.previewImage({
-					current: index, 	//图片索引
-					urls: previewUrls, //必须是http图片，本地图片无效
-					longPressActions:''
-				})
-			},
-			handButtonConfirm(data){//监听点击时间的按钮类型并执行...
-				// console.log(data)
-				this.handShowAlert(data)
-			},
-			handShowAlert(data){//判断点击的按钮类型并执行...
-				let hanldType = data.hanldType
-				let hanldData = data.hanldData
-				console.log(hanldData);
-				switch(hanldType){
-					case 'cancel':
-						this.handCenceConfirm(hanldData)
-						break
-					case 'add':
-						let setProductList =[]
-						let repleArray =hanldData.logisticsRecordList
-						repleArray.forEach(el=>{
-							let elObject = {
-									orderProductId:el.orderProductId,
-									num:el.num
-							}
-							setProductList.push(elObject)
-						})
-						let data = {
-								logisticsBatchId:hanldData.id,
-								logisticsBatchData:setProductList
-							}
-						this.$api.navigateTo(`/pages/supplier/deliver/add-logistics?type=reple&mobile=${this.mobile}&shopOrderId=${this.listQuery.shopOrderId}&data=${JSON.stringify(data)}`)
-						break
-					case 'qualifications':
-						this.$api.navigateTo(`/pages/supplier/deliver/qualifications-details?logisticsBatchId=${hanldData.id}&shopOrderId=${this.listQuery.shopOrderId}`)
-						break
-						
+		},
+		setHeaderBtnPosi() {
+			// 获得胶囊按钮位置信息
+			let headerBtnPosi = uni.getMenuButtonBoundingClientRect()
+			return headerBtnPosi
+		},
+		setSysteminfo() {
+			// 获取设备信息
+			let systeminfo
+			uni.getSystemInfo({
+				success: res => {
+					systeminfo = res
 				}
-			},
-			handCenceConfirm(data){//取消订单
-				this.$util.modal('提示','确定要撤销本次发货吗？撤销后需重新发货','确定','取消',true,() =>{
-					this.ShopService.ShopCancelShipment({ logisticsBatchId : data.id }).then(response =>{
-						this.$util.msg('撤销成功',2000,true,'success');
-						setTimeout(()=>{
-							this.initShopShipmentsRecord()
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
+			})
+			return systeminfo
+		},
+		setScrollHeight() {
+			const { windowHeight, pixelRatio } = wx.getSystemInfoSync()
+			this.windowHeight = windowHeight - 1
+			this.scrollHeight = windowHeight - 1
+		},
+		previewImg(index, previewUrls) {
+			//顶部商品图片预览
+			isPreviewImg = true
+			uni.previewImage({
+				current: index, //图片索引
+				urls: previewUrls, //必须是http图片，本地图片无效
+				longPressActions: ''
+			})
+		},
+		handButtonConfirm(data) {
+			//监听点击时间的按钮类型并执行...
+			// console.log(data)
+			this.handShowAlert(data)
+		},
+		handShowAlert(data) {
+			//判断点击的按钮类型并执行...
+			let hanldType = data.hanldType
+			let hanldData = data.hanldData
+			console.log(hanldData)
+			switch (hanldType) {
+				case 'cancel':
+					this.handCenceConfirm(hanldData)
+					break
+				case 'add':
+					let setProductList = []
+					let repleArray = hanldData.logisticsRecordList
+					repleArray.forEach(el => {
+						let elObject = {
+							orderProductId: el.orderProductId,
+							num: el.num
+						}
+						setProductList.push(elObject)
 					})
-				})
-			},
-			pageGoLink(){
-				this.$api.navigateTo('/pages/supplier/deliver/deliver-goods?shopOrderId='+this.listQuery.shopOrderId)
-			},
-			hanldPageDetails(){
-				this.$api.navigateTo('/pages/supplier/order/order-details?shopOrderId='+this.listQuery.shopOrderId)
+					let data = {
+						logisticsBatchId: hanldData.id,
+						logisticsBatchData: setProductList
+					}
+					this.$api.navigateTo(
+						`/pages/supplier/deliver/add-logistics?type=reple&mobile=${this.mobile}&shopOrderId=${
+							this.listQuery.shopOrderId
+						}&data=${JSON.stringify(data)}`
+					)
+					break
+				case 'qualifications':
+					this.$api.navigateTo(
+						`/pages/supplier/deliver/qualifications-details?logisticsBatchId=${hanldData.id}&shopOrderId=${
+							this.listQuery.shopOrderId
+						}`
+					)
+					break
 			}
 		},
-		onPullDownRefresh() {//下拉刷新
-			this.initShopShipmentsRecord()
-			uni.stopPullDownRefresh()
-		},
-		onReachBottom() {
-			if(this.hasNextPage){
-				this.loadding = true
-				this.pullUpOn = true
-				this.getOnReachBottomData()
-			}	
+		handCenceConfirm(data) {
+			//取消订单
+			this.$util.modal('提示', '确定要撤销本次发货吗？撤销后需重新发货', '确定', '取消', true, () => {
+				this.ShopService.ShopCancelShipment({ logisticsBatchId: data.id })
+					.then(response => {
+						this.$util.msg('撤销成功', 2000, true, 'success')
+						setTimeout(() => {
+							this.initShopShipmentsRecord()
+						}, 2000)
+					})
+					.catch(error => {
+						this.$util.msg(error.msg, 2000)
+					})
+			})
 		},
-		onShow(){
-			
+		pageGoLink() {
+			this.$api.navigateTo('/pages/supplier/deliver/deliver-goods?shopOrderId=' + this.listQuery.shopOrderId)
 		},
-	}
+		hanldPageDetails() {
+			this.$api.navigateTo('/pages/supplier/order/order-details?shopOrderId=' + this.listQuery.shopOrderId)
+		}
+	},
+	onPullDownRefresh() {
+		//下拉刷新
+		this.initShopShipmentsRecord()
+		uni.stopPullDownRefresh()
+	},
+	onReachBottom() {
+		if (this.hasNextPage) {
+			this.loadding = true
+			this.pullUpOn = true
+			this.getOnReachBottomData()
+		}
+	},
+	onShow() {}
+}
 </script>
 
 <style lang="scss">
-	page{
-		background: #f7f7f7;
-		height: auto;
+page {
+	background: #f7f7f7;
+	height: auto;
+}
+.record-content {
+	position: relative;
+	border-top: 1px solid #ebebeb;
+	.scroll-view {
+		height: 100%;
 	}
-	.record-content{
-		position: relative;
-		border-top: 1px solid #EBEBEB;
-		.scroll-view{
-			height: 100%;
+}
+.record-content-empty {
+	width: 100%;
+	height: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	.record-container {
+		width: 400rpx;
+		height: auto;
+		image {
+			width: 400rpx;
+			height: 400rpx;
+			display: block;
 		}
-	}
-	.record-content-empty{
-		width: 100%;
-		height: 100%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		.record-container{
+		.txt {
+			font-size: $font-size-28;
+			text-align: center;
+			color: #333;
+			line-height: 30rpx;
+			margin-bottom: 20rpx;
+		}
+		.btn {
 			width: 400rpx;
+			height: 80rpx;
+			background: $btn-confirm;
+			border-radius: 40rpx;
+			line-height: 80rpx;
+			font-size: $font-size-28;
+			text-align: center;
+			color: #ffffff;
+		}
+	}
+}
+.record-list {
+	width: 100%;
+	height: auto;
+	background-color: #f7f7f7;
+	margin-bottom: 24rpx;
+	.record-top {
+		width: 702rpx;
+		padding: 20rpx 24rpx;
+		height: auto;
+		background-color: #fff;
+		margin-bottom: 20rpx;
+		.top-view {
+			width: 100%;
 			height: auto;
-			image{
-				width: 400rpx;
-				height: 400rpx;
-				display: block;
-			}
-			.txt{
-				font-size: $font-size-28;
-				text-align: center;
-				color: #333;
-				line-height: 30rpx;
-				margin-bottom: 20rpx;
+			float: left;
+			line-height: 50rpx;
+			font-size: $font-size-28;
+			color: #333333;
+			display: flex;
+			.top-viewlabel {
+				width: 130rpx;
+				margin-right: 10rpx;
+				color: #999999;
 			}
-			.btn{
-				width: 400rpx;
-				height: 80rpx;
-				background: $btn-confirm;
-				border-radius: 40rpx;
-				line-height: 80rpx;
-				font-size: $font-size-28;
-				text-align: center;
-				color: #FFFFFF;
+			.top-viewtext {
+				width: 562rpx;
+				height: auto;
+				text {
+					display: inline-block;
+					margin-right: 30rpx;
+				}
 			}
 		}
 	}
-	.record-list{
+	.goods-pros {
+		width: 702rpx;
+		padding: 0 24rpx;
+		background: #ffffff;
+	}
+	.goods-pros-t {
+		display: flex;
 		width: 100%;
 		height: auto;
-		background-color: #F7F7F7;
-		margin-bottom: 24rpx;
-		.record-top{
-			width: 702rpx;
-			padding: 20rpx 24rpx;
-			height: auto;
-			background-color: #FFF;
-			margin-bottom: 20rpx;
-			.top-view{
+		padding: 20rpx 0;
+		.pros-img {
+			width: 210rpx;
+			height: 210rpx;
+			border-radius: 10rpx;
+			margin: 0 20rpx;
+			border: 1px solid #f3f3f3;
+			margin-left: 0;
+			image {
 				width: 100%;
-				height: auto;
-				float: left;
-				line-height: 50rpx;
-				font-size: $font-size-28;
-				color: #333333;
-				display: flex;
-				.top-viewlabel{
-					width: 130rpx;
-					margin-right: 10rpx;
-					color: #999999;
-				}
-				.top-viewtext{
-					width:562rpx;
-					height: auto;
-					text{
-						display: inline-block;
-						margin-right: 30rpx;
-					}
-				}
+				height: 100%;
+				border-radius: 10rpx;
 			}
 		}
-		.goods-pros{
-			width: 702rpx;
-			padding: 0 24rpx;
-			background: #FFFFFF;
-		}	
-		.goods-pros-t{
-			display: flex;
-			width: 100%;
-			height: auto;
-			padding:20rpx 0;
-			.pros-img{
-				width: 210rpx;
-				height: 210rpx;
-				border-radius: 10rpx;
-				margin:0 20rpx;
-				border:1px solid #f3f3f3;
-				margin-left: 0;
-				image{
-					width: 100%;
-					height: 100%;
-					border-radius: 10rpx;
-				}
+		.pros-product {
+			width: 492rpx;
+			height: 100%;
+			line-height: 36rpx;
+			font-size: $font-size-28;
+			position: relative;
+			.producttitle {
+				width: 100%;
+				display: inline-block;
+				height: auto;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				word-break: break-all;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 2;
+				overflow: hidden;
+				margin-bottom: 8rpx;
 			}
-			.pros-product{
-				width: 492rpx;
-				height: 100%;
-				line-height: 36rpx;
-				font-size: $font-size-28;	
-				position: relative;
-				.producttitle{
-					width: 100%;
-					display: inline-block;
-					height: auto;							
-					text-overflow:ellipsis;
-					display: -webkit-box;
-					word-break: break-all;
-					-webkit-box-orient: vertical;
-					-webkit-line-clamp: 2;
-					overflow: hidden;
-					margin-bottom: 8rpx;
-				}
-				.productspec{
-					height: 44rpx;
-					color: #999999;
-					line-height: 44rpx;
+			.productspec {
+				height: 44rpx;
+				color: #999999;
+				line-height: 44rpx;
+				font-size: $font-size-26;
+			}
+			.product-view {
+				width: 100%;
+				height: auto;
+				display: flex;
+				.view-num {
+					flex: 1;
+					text-align: left;
 					font-size: $font-size-26;
-				}
-				.product-view{
-					width: 100%;
-					height: auto;
-					display: flex;
-					.view-num{
-						flex: 1;
-						text-align: left;
-						font-size: $font-size-26;
-						color: #666666;
-						line-height: 44rpx;
-					}
+					color: #666666;
+					line-height: 44rpx;
 				}
 			}
 		}
-		.goods-pros-b{
-			width:100%;
+	}
+	.goods-pros-b {
+		width: 100%;
+		height: auto;
+		padding: 10rpx 0;
+		border-top: 1px solid #f7f7f7;
+		border-bottom: 1px solid #f7f7f7;
+		position: relative;
+		.b-label {
+			width: 100%;
+			line-height: 70rpx;
+			font-size: $font-size-28;
+			color: $text-color;
+		}
+		.b-photo {
+			width: 100%;
 			height: auto;
 			padding: 10rpx 0;
-			border-top: 1px solid #F7F7F7;
-			border-bottom: 1px solid #F7F7F7;
-			position: relative;
-			.b-label{
-				width: 100%;
-				line-height: 70rpx;
-				font-size: $font-size-28;
-				color: $text-color;
-			}
-			.b-photo{
-				width: 100%;
-				height: auto;
-				padding: 10rpx 0;
-				.b-imageView{
+			.b-imageView {
+				width: 112rpx;
+				height: 112rpx;
+				margin: 0 20rpx 20rpx 0;
+				float: left;
+				image {
 					width: 112rpx;
 					height: 112rpx;
-					margin: 0 20rpx 20rpx 0;
-					float: left;
-					image{
-						width: 112rpx;
-						height: 112rpx;
-						display: block;
-					}
-				}
-				.text{
-					line-height: 44rpx;
-					font-size: $font-size-28;
-					color: $text-color;
+					display: block;
 				}
 			}
-			.goods-pros-m{
-				width: 100%;
-				height: auto;
-				line-height: 76rpx;
-				font-size: $font-size-26;
+			.text {
+				line-height: 44rpx;
+				font-size: $font-size-28;
 				color: $text-color;
+			}
+		}
+		.goods-pros-m {
+			width: 100%;
+			height: auto;
+			line-height: 76rpx;
+			font-size: $font-size-26;
+			color: $text-color;
+			float: left;
+			padding: 10rpx 0;
+			border-top: 1px solid #f7f7f7;
+			border-bottom: 1px solid #f7f7f7;
+			.m-text {
+				width: 62rpx;
 				float: left;
-				padding: 10rpx 0;
-				border-top: 1px solid #F7F7F7;
-				border-bottom: 1px solid #F7F7F7;
-				.m-text{
-					width: 62rpx;
-					float: left;
-					padding-right: 20rpx;
-					font-weight:bold;
-				}
-				.m-input{
-					display: -webkit-box;
-					display: -webkit-flex;
-					display: flex;
-					-webkit-box-align: center;
-					-webkit-align-items: center;
-					align-items: center;
-					position: relative;
-					width: 620rpx;
-					height: auto;
-					padding: 20rpx 0 10rpx 0;
-					background: #FFFFFF;
-					.text{
-						width: 100%;
-						height: 100%;
-						font-size: $font-size-26;
-						line-height: 36rpx;
-						color: #333333;
-					}
+				padding-right: 20rpx;
+				font-weight: bold;
+			}
+			.m-input {
+				display: -webkit-box;
+				display: -webkit-flex;
+				display: flex;
+				-webkit-box-align: center;
+				-webkit-align-items: center;
+				align-items: center;
+				position: relative;
+				width: 620rpx;
+				height: auto;
+				padding: 20rpx 0 10rpx 0;
+				background: #ffffff;
+				.text {
+					width: 100%;
+					height: 100%;
+					font-size: $font-size-26;
+					line-height: 36rpx;
+					color: #333333;
 				}
 			}
 		}
 	}
-</style>
+}
+</style>

pages/supplier/deliver/qualifications-details.vue

@@ -1,241 +1,251 @@
 <template>
-	<view class="container qualifications" :style="{paddingBottom :isIphoneX ? (150+68)+'rpx' : '150rpx'}">
+	<view class="container qualifications" :style="{ paddingBottom: isIphoneX ? 150 + 68 + 'rpx' : '150rpx' }">
 		<view class="qualifications-content" v-if="!isEmpty">
-			<view class="list" v-for="(item,index) in qualificationsList" :key="index">
-				<view class="list-view-title">商品{{ index+1 }}</view>
+			<view class="list" v-for="(item, index) in qualificationsList" :key="index">
+				<view class="list-view-title">商品{{ index + 1 }}</view>
 				<view class="list-view">
-					<view class="list-view-label">商品</view>
-					<view class="list-view-text">{{ item.productName }}</view>
+					<view class="list-view-label">商品</view> <view class="list-view-text">{{ item.productName }}</view>
 				</view>
 				<view class="list-view">
-					<view class="list-view-label">SN码</view>
-					<view class="list-view-text">{{ item.sn }}</view>
+					<view class="list-view-label">SN码</view> <view class="list-view-text">{{ item.sn }}</view>
 				</view>
-				<view class="list-view" v-for="(file,fileIndex) in item.fileList" :key="fileIndex">
+				<view class="list-view" v-for="(file, fileIndex) in item.fileList" :key="fileIndex">
 					<view class="list-view-label">资质文件</view>
 					<view class="list-view-text">{{ file.fileName }}</view>
-				</view>	
+				</view>
 				<view class="list-view-title none">图片</view>
 				<view class="list-view-upload clearfix">
 					<view class="photo-item" v-for="(image, imageIndex) in item.imageList" :key="index">
-						<image :src="image" mode="aspectFill" @click.stop="previewImg(item.imageList,imageIndex)"></image>
+						<image
+							:src="image"
+							mode="aspectFill"
+							@click.stop="previewImg(item.imageList, imageIndex)"
+						></image>
 					</view>
 				</view>
 			</view>
-			<view class="qualifications-btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '0'}">
+			<view class="qualifications-btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '0' }">
 				<view class="edit-button" @click="editSubmitFn('edit')">编辑</view>
 			</view>
 		</view>
 		<view v-else class="cart-content empty">
-			<view  class="empty-container">
-				<image class="empty-container-image" src="https://static.caimei365.com/app/img/icon/icon-ques-empty@2x.png" mode="aspectFit"></image>
+			<view class="empty-container">
+				<image
+					class="empty-container-image"
+					src="https://static.caimei365.com/app/img/icon/icon-ques-empty@2x.png"
+					mode="aspectFit"
+				></image>
 				<text class="error-text">暂无商品资质信息</text>
-				<view class="login-btn"  @click="editSubmitFn('add')">去补充</view>
+				<view class="login-btn" @click="editSubmitFn('add')">去补充</view>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
-	import { mapState,mapMutations } from 'vuex'
-	import authorize from '@/common/config/authorize.js' 
-	var isPreviewImg;
-	export default{
-		data() {
-			return{
-				logisticsBatchId:0,
-				shopOrderId:0,
-				isIphoneX:this.$store.state.isIphoneX,
-				isEmpty:false,
-				qualificationsList:[]
-			}
-		},
-		onLoad(option) {
-			this.shopOrderId = option.shopOrderId
-			this.logisticsBatchId = option.logisticsBatchId
-			console.log('shopOrderId',this.shopOrderId)
-			this.GetSupplierQualificationData(option.logisticsBatchId)
-		},
-		methods:{
-			...mapMutations(['login']),
-			GetSupplierQualificationData(logisticsBatchId){
-				this.ShopService.GetSupplierQualificationData(
-					{ 
-						logisticsBatchId : logisticsBatchId ,
-					}
-				)
-				.then(response =>{
+import { mapState, mapMutations } from 'vuex'
+import authorize from '@/common/config/authorize.js'
+var isPreviewImg
+export default {
+	data() {
+		return {
+			logisticsBatchId: 0,
+			shopOrderId: 0,
+			isIphoneX: this.$store.state.isIphoneX,
+			isEmpty: false,
+			qualificationsList: []
+		}
+	},
+	onLoad(option) {
+		this.shopOrderId = option.shopOrderId
+		this.logisticsBatchId = option.logisticsBatchId
+		console.log('shopOrderId', this.shopOrderId)
+		this.GetSupplierQualificationData(option.logisticsBatchId)
+	},
+	methods: {
+		...mapMutations(['login']),
+		GetSupplierQualificationData(logisticsBatchId) {
+			this.ShopService.GetSupplierQualificationData({
+				logisticsBatchId: logisticsBatchId
+			})
+				.then(response => {
 					const data = response.data
-					if(data && data.length > 0){
+					if (data && data.length > 0) {
 						this.qualificationsList = data
 						this.isEmpty = false
-					}else{
+					} else {
 						this.isEmpty = true
 					}
 				})
-				.catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			editSubmitFn(type){
-				switch(type){
-					case 'edit':
-						this.$api.navigateTo(`/pages/supplier/deliver/qualifications-add?type=edit&logisticsBatchId=${this.logisticsBatchId}&shopOrderId=${this.shopOrderId}`)
-						break;
-					case 'add':
-						this.$api.navigateTo(`/pages/supplier/deliver/qualifications-add?type=add&logisticsBatchId=${this.logisticsBatchId}&shopOrderId=${this.shopOrderId}`)
-						break;
-				}
-			},
-			previewImg (Array,index) {//顶部商品图片预览
-				console.log(Array)
-				isPreviewImg = true
-				let previewUrls = Array
-				uni.previewImage({
-					current: index, 	//图片索引
-					urls: previewUrls, //必须是http图片，本地图片无效
-					longPressActions:''
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
 				})
-			},
 		},
-		onShow() {
-			
+		editSubmitFn(type) {
+			switch (type) {
+				case 'edit':
+					this.$api.navigateTo(
+						`/pages/supplier/deliver/qualifications-add?type=edit&logisticsBatchId=${
+							this.logisticsBatchId
+						}&shopOrderId=${this.shopOrderId}`
+					)
+					break
+				case 'add':
+					this.$api.navigateTo(
+						`/pages/supplier/deliver/qualifications-add?type=add&logisticsBatchId=${
+							this.logisticsBatchId
+						}&shopOrderId=${this.shopOrderId}`
+					)
+					break
+			}
+		},
+		previewImg(Array, index) {
+			//顶部商品图片预览
+			console.log(Array)
+			isPreviewImg = true
+			let previewUrls = Array
+			uni.previewImage({
+				current: index, //图片索引
+				urls: previewUrls, //必须是http图片，本地图片无效
+				longPressActions: ''
+			})
 		}
-	}
+	},
+	onShow() {}
+}
 </script>
 
 <style lang="scss">
-	page {
-		height: auto;
-		background:#F7F7F7;
-	}
-	.qualifications-content{
+page {
+	height: auto;
+	background: #f7f7f7;
+}
+.qualifications-content {
+	width: 100%;
+	height: auto;
+	.list {
 		width: 100%;
 		height: auto;
-		.list{
+		background-color: #ffffff;
+		box-sizing: border-box;
+		margin-bottom: 20rpx;
+		padding: 0 24rpx;
+		.list-view-title {
 			width: 100%;
-			height: auto;
-			background-color: #FFFFFF;
-			box-sizing: border-box;
-			margin-bottom: 20rpx;
-			padding: 0 24rpx;
-			.list-view-title{
-				width: 100%;
-				height: 92rpx;
-				border-bottom: 1px solid #E1E1E1;
-				line-height: 92rpx;
-				font-size: $font-size-30;
+			height: 92rpx;
+			border-bottom: 1px solid #e1e1e1;
+			line-height: 92rpx;
+			font-size: $font-size-30;
+			color: #333333;
+			text-align: left;
+			&.none {
+				border-bottom: none;
+				color: #666666;
+			}
+		}
+		.list-view {
+			width: 100%;
+			height: 92rpx;
+			border-bottom: 1px solid #e1e1e1;
+			line-height: 92rpx;
+			font-size: $font-size-30;
+			.list-view-label {
+				width: 192rpx;
+				color: #666666;
+				float: left;
+			}
+			.list-view-text {
+				width: 510rpx;
 				color: #333333;
-				text-align: left;
-				&.none{
-					border-bottom: none;
-					color: #666666;
-				}
+				text-overflow: ellipsis;
+				overflow: hidden;
+				display: -webkit-box;
+				-webkit-line-clamp: 1;
+				line-clamp: 1;
+				-webkit-box-orient: vertical;
+				float: right;
 			}
-			.list-view{
-				width: 100%;
-				height: 92rpx;
-				border-bottom: 1px solid #E1E1E1;
-				line-height: 92rpx;
-				font-size: $font-size-30;
-				.list-view-label{
-					width: 192rpx;
-					color: #666666;
-					float: left;
+		}
+		.list-view-upload {
+			width: 100%;
+			height: auto;
+			padding: 10rpx 0;
+			.photo-item {
+				display: inline-block;
+				width: 112rpx;
+				height: 112rpx;
+				margin: 10rpx 0;
+				margin-right: 25rpx;
+				border-radius: 10rpx;
+				border: 1px solid #f5f5f5;
+				position: relative;
+				float: left;
+				&.add {
+					width: 112rpx;
+					height: 112rpx;
+					border-color: #ffc684;
+					text-align: center;
+					line-height: 112rpx;
+					margin-right: 0rpx;
+					.icon-jiahao {
+						font-size: $font-size-44;
+						color: #ffc684;
+						font-weight: bold;
+					}
 				}
-				.list-view-text{
-					width: 510rpx;
-					color: #333333;
-					text-overflow: ellipsis;
-					overflow: hidden;
-					display: -webkit-box;
-					-webkit-line-clamp: 1;
-					line-clamp: 1;
-					-webkit-box-orient: vertical;
-					float: right;
+				.icon-iconfontguanbi {
+					width: 30rpx;
+					height: 30rpx;
+					border-radius: 50%;
+					display: block;
+					position: absolute;
+					right: -10rpx;
+					top: -10rpx;
+					background: #f94b4b;
+					text-align: center;
+					line-height: 30rpx;
+					color: #ffffff;
+					font-size: $font-size-22;
 				}
-			}
-			.list-view-upload{
-				width: 100%;
-				height: auto;	
-				padding: 10rpx 0;
-				.photo-item{
-					display: inline-block;
+				image {
 					width: 112rpx;
 					height: 112rpx;
-					margin: 10rpx 0;
-					margin-right: 25rpx;
 					border-radius: 10rpx;
-					border:1px solid #F5F5F5;
-					position: relative;
-					float: left;
-					&.add{
-						width: 112rpx;
-						height: 112rpx;
-						border-color: #FFC684;
-						text-align: center;
-						line-height: 112rpx;
-						margin-right: 0rpx;
-						.icon-jiahao{
-							font-size: $font-size-44;
-							color:#FFC684 ;
-							font-weight: bold;
-						}
-					}
-					.icon-iconfontguanbi{
-						width: 30rpx;
-						height: 30rpx;
-						border-radius:50%;
-						display: block;
-						position: absolute;
-						right: -10rpx;
-						top: -10rpx;
-						background: #f94b4b;
-						text-align: center;
-						line-height: 30rpx;
-						color: #FFFFFF;
-						font-size: $font-size-22;
-					}
-					image{
-						width: 112rpx;
-						height: 112rpx;
-						border-radius: 10rpx;
-					}
-				}	
-				.photo-list{
-					width: 100%;
-					height: 116rpx;
-					overflow: hidden;
-					white-space: nowrap;
-					display: flex;
-					align-items: flex-start;
-				}
-				.scoll-wrapper{
-					display:flex;
-					align-items: flex-start;
 				}
 			}
+			.photo-list {
+				width: 100%;
+				height: 116rpx;
+				overflow: hidden;
+				white-space: nowrap;
+				display: flex;
+				align-items: flex-start;
+			}
+			.scoll-wrapper {
+				display: flex;
+				align-items: flex-start;
+			}
 		}
-		.qualifications-btn{
-			width: 100%;
+	}
+	.qualifications-btn {
+		width: 100%;
+		height: 90rpx;
+		padding-top: 60rpx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		background-color: #ffffff;
+		.edit-button {
+			width: 600rpx;
 			height: 90rpx;
-			padding-top: 60rpx;
-			position: fixed;
-			bottom: 0;
-			left: 0;
-			background-color: #FFFFFF;
-			.edit-button{
-				width: 600rpx;
-				height: 90rpx;
-				background: $btn-confirm;
-				line-height: 90rpx;
-				text-align: center;
-				color: #FFFFFF;
-				font-size: 30rpx;
-				margin: 0 auto;
-				border-radius: 45rpx;
-			}
+			background: $btn-confirm;
+			line-height: 90rpx;
+			text-align: center;
+			color: #ffffff;
+			font-size: 30rpx;
+			margin: 0 auto;
+			border-radius: 45rpx;
 		}
 	}
-	
+}
 </style>

pages/user/account/account-bean.vue

@@ -139,7 +139,8 @@
 						10:'抵用运费',
 						11:'退款回收',
 						12:'登录奖励',
-                        13:'查看商品资料'
+                        13:'查看商品资料',
+                        14:'购买超级会员'
 					}
 				Object.keys(stateTextObject).forEach(function(key){
 					if(key == state){

services/ajax.env.js

@@ -1,11 +1,10 @@
 let URL_CONFIG = ''
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-    // URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
-    // URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
-    // URL_CONFIG = 'http://192.168.2.81:8008'
+    // URL_CONFIG = 'http://192.168.2.67:8008'	 //智捷联调地址
+    // URL_CONFIG = 'http://192.168.2.68:8008'	 	 //涛涛联调地址
     // URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+    URL_CONFIG = 'https://spi-b.caimei365.com'//采美测试地址
     // URL_CONFIG = 'https://spi.caimei365.com'
 }else{ 
     // 生产环境

services/config.env.js

@@ -1,8 +1,9 @@
 let URL_CONFIG = ''
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
+    // URL_CONFIG = 'http://192.168.2.67:18002'	 //智捷联调地址
+    // URL_CONFIG = 'http://192.168.2.68:18002'	 //涛涛联调地址
     // URL_CONFIG = 'http://192.168.2.75:18002'	 //超超联调地址
-    // URL_CONFIG = 'http://192.168.2.68:18002'	 //裴裴联调地址
     URL_CONFIG = 'https://core-b.caimei365.com'
     // URL_CONFIG = 'https://core.caimei365.com'
 }else{

services/user.service.js

@@ -2,146 +2,146 @@
  * 这是用户业务逻辑的服务
  */
 export default class UserService {
-	constructor(AjaxService) {
-		Object.assign(this, { AjaxService })
-		this.name = 'UserService'
-	}
-	/* 初始化授权登录 */
-	UserLoginAuthApplets (data = {}) {
-		return this.AjaxService.post({
-			url: '/user/login/auth/applets',
-			data,
-			isLoading: false,
-			isHost:true
-		})
-	}
-	/* 邀请码授权登录 */
-	InvitationCodeLogin (data = {}) {
-		return this.AjaxService.post({
-			url: '/user/login/auth/invitation',
-			data,
-			isLoading: true,
-			isStatus: false,
-			isHost:true
-		})
-	}
-	/* 个人机构注册 */
-	UserRegisterClub (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/register/club', 
-			data, 
-			isLoading: true,
-			isHost:true
-		})
-	}
-	/* 供应商注册 */ 
-	SupplierAppletsRegistered (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/register/shop', 
-			data, 
-			isLoading: true,
-			isHost:true
-		})
-	}
-	/**
+    constructor(AjaxService) {
+        Object.assign(this, { AjaxService })
+        this.name = 'UserService'
+    }
+    /* 初始化授权登录 */
+    UserLoginAuthApplets (data = {}) {
+        return this.AjaxService.post({
+            url: '/user/login/auth/applets',
+            data,
+            isLoading: false,
+            isHost:true
+        })
+    }
+    /* 邀请码授权登录 */
+    InvitationCodeLogin (data = {}) {
+        return this.AjaxService.post({
+            url: '/user/login/auth/invitation',
+            data,
+            isLoading: true,
+            isStatus: false,
+            isHost:true
+        })
+    }
+    /* 个人机构注册 */
+    UserRegisterClub (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/register/club', 
+            data, 
+            isLoading: true,
+            isHost:true
+        })
+    }
+    /* 供应商注册 */ 
+    SupplierAppletsRegistered (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/register/shop', 
+            data, 
+            isLoading: true,
+            isHost:true
+        })
+    }
+    /**
 	 * 账号登录
 	 * @param mobileOrEmail 邮箱或手机
 	 * @param password	密码
 	 * @param source 来源 PC与小程序传:'www'crm就传'crm'
 	 */
-	AorganizationLogin (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/login/password', 
-			data, 
-			isLoading: true ,
-			isStatus: true,
-			isHost:true
-		})
-	}
-	/* 查询机构资料*/
-	OrganizationUpdateModifyInfo (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/user/club/info',
-			data, 
-			isLoading: true,
-			isHost:true
-		})
-	}
-	/* 协销拉机构上线(查询暂时数据)*/
-	UseRregisterTemporaryInfo (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/user/register/temporary/data',
-			data, 
-			isLoading: true,
-			isHost:true
-		})
-	}
-	/* 机构升级资质机构 */
-	OrganizationRegister (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/register/club/upgrade', 
-			data, 
-			isLoading: true,
-			isHost:true
-		})
-	}
-	/* 机构提交资料修改 */
-	OrganizationUpdate (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/club/info/update', 
-			data, 
-			isLoading: true,
-			isHost:true
-		})
-	}
-	/* 供应商资料信息-数据回显 */
-	SupplierShopInfo (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/user/shop/info', 
-			data, 
-			isLoading: true,
-			isHost:true
-		})
-	}
-	/* 供应商修改申请信息保存 */
-	SupplierUpdateCompanyInfo (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/register/shop/apply', 
-			data, 
-			isLoading: true,
-			isHost:true
-		})
-	}
-	/* 供应商资料信息-提交修改 */
-	SupplierModifiedData (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/shop/info/update', 
-			data, 
-			isLoading: true,
-			isHost:true
-		})
-	}
-	/**
+    AorganizationLogin (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/login/password', 
+            data, 
+            isLoading: true ,
+            isStatus: true,
+            isHost:true
+        })
+    }
+    /* 查询机构资料*/
+    OrganizationUpdateModifyInfo (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/club/info',
+            data, 
+            isLoading: true,
+            isHost:true
+        })
+    }
+    /* 协销拉机构上线(查询暂时数据)*/
+    UseRregisterTemporaryInfo (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/register/temporary/data',
+            data, 
+            isLoading: true,
+            isHost:true
+        })
+    }
+    /* 机构升级资质机构 */
+    OrganizationRegister (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/register/club/upgrade', 
+            data, 
+            isLoading: true,
+            isHost:true
+        })
+    }
+    /* 机构提交资料修改 */
+    OrganizationUpdate (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/club/info/update', 
+            data, 
+            isLoading: true,
+            isHost:true
+        })
+    }
+    /* 供应商资料信息-数据回显 */
+    SupplierShopInfo (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/shop/info', 
+            data, 
+            isLoading: true,
+            isHost:true
+        })
+    }
+    /* 供应商修改申请信息保存 */
+    SupplierUpdateCompanyInfo (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/register/shop/apply', 
+            data, 
+            isLoading: true,
+            isHost:true
+        })
+    }
+    /* 供应商资料信息-提交修改 */
+    SupplierModifiedData (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/shop/info/update', 
+            data, 
+            isLoading: true,
+            isHost:true
+        })
+    }
+    /**
 	 *运营人员绑定微信
 	 */
-	BindingWechat (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/login/auth/bind', 
-			data, 
-			isLoading: true,
-			isHost:true
-		})
-	}
-	/*个人机构取消提示*/
-	CancelPrompt (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/user/register/guide', 
-			data, 
-			isLoading: false ,
-			isHost:true
-		})
-	}
-	/**
+    BindingWechat (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/login/auth/bind', 
+            data, 
+            isLoading: true,
+            isHost:true
+        })
+    }
+    /*个人机构取消提示*/
+    CancelPrompt (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/register/guide', 
+            data, 
+            isLoading: false ,
+            isHost:true
+        })
+    }
+    /**
 	 * 找回密码&修改密码
 	 * @param: mobileOrEmail	手机号或邮箱	
 	 * @param: password			密码
@@ -149,15 +149,15 @@ export default class UserService {
 	 * @param: smsCode			短信验证码
 	 * @param: status			1:手机号找回,2:邮箱找回
 	*/
-	ModifyMobilePassword (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/update/password', 
-			data, 
-			isLoading: true ,
-			isHost:true
-		})
-	}
-	/**
+    ModifyMobilePassword (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/update/password', 
+            data, 
+            isLoading: true ,
+            isHost:true
+        })
+    }
+    /**
 	 * 更换手机号
 	 * @param: mobile			原手机号	
 	 * @param: newMobile		新手机号
@@ -165,172 +165,172 @@ export default class UserService {
 	 * @param: newSmsCode		新手机号验证码
 	 * @param: userId			用户userId
 	*/
-	UserUpdateMobile (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/update/mobile', 
-			data, 
-			isLoading: true ,
-			isHost:true
-		})
-	}
-	/**
+    UserUpdateMobile (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/update/mobile', 
+            data, 
+            isLoading: true ,
+            isHost:true
+        })
+    }
+    /**
 	 * @机构-地址列表
 	 * @param:userId 用户ID(必传)，
 	 * @param:pageNum 页码
 	 * @param:pageSize 每页条数
 	 */
-	QueryAddressList (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/order/address/list', 
-			data, 
-			isLoading: true ,
-			isHost:true
-		})
-	}
-	/**
+    QueryAddressList (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/order/address/list', 
+            data, 
+            isLoading: true ,
+            isHost:true
+        })
+    }
+    /**
 	 * @机构-添加&&修改地址
 	 * @param:userId 用户ID(必传)，
 	 * @param:地址信息，
 	 */
-	AddressSave (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/order/address/save', 
-			data, 
-			isLoading: true ,
-			isHost:true
-		})
-	}
-	/**
+    AddressSave (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/order/address/save', 
+            data, 
+            isLoading: true ,
+            isHost:true
+        })
+    }
+    /**
 	 * @机构-删除地址
 	 * @param:userId 用户ID(必传)，
 	 * @param:地址信息，
 	 */
-	DeleteAddress (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/order/address/delete', 
-			data, 
-			isLoading: true ,
-			isHost:true
-		})
-	}
-	/**
+    DeleteAddress (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/order/address/delete', 
+            data, 
+            isLoading: true ,
+            isHost:true
+        })
+    }
+    /**
 	 * @机构-个人中心
 	 * @param:userId 用户ID(必传)，
 	 */
-	PersonalInfo (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/personalCenter/myCentre', 
-			data, 
-			isLoading: false ,
-		})
-	}
-	/**
+    PersonalInfo (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/personalCenter/myCentre', 
+            data, 
+            isLoading: false ,
+        })
+    }
+    /**
 	 * @机构-获取账户余额明细
 	 * @param:userId 用户ID(必传)，
 	 */
-	GetAccountInfo (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/personalCenter/touchBalance', 
-			data, 
-			isLoading: true ,
-		})
-	}
-	/* 运营人员管理-列表 */
-	QueryOperatorList (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/user/operation/list', 
-			data, 
-			isLoading: true ,
-			isHost:true
-		})
-	}
-	/* 运营人员管理-添加 */
-	PostAddOperator (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/operation/save', 
-			data, 
-			isLoading: true ,
-			isHost:true
-		})
-	}
-	/* 运营人员管理-删除 */
-	PostDeleteOperator (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/operation/delete', 
-			data, 
-			isLoading: true ,
-			isHost:true
-		})
-	}
-	/* 运营人员管理-更新邀请码 */
-	PostUpdateOperatorCode (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/operation/code/update', 
-			data, 
-			isLoading: true ,
-			isHost:true
-		})
-	}
-	/* 机构购物车简单列表*/
-	GetUserCartNumber (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/shoppingCart/header/cart', 
-			data, 
-			isLoading: true ,
-		})
-	}
-	/**
+    GetAccountInfo (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/personalCenter/touchBalance', 
+            data, 
+            isLoading: true ,
+        })
+    }
+    /* 运营人员管理-列表 */
+    QueryOperatorList (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/operation/list', 
+            data, 
+            isLoading: true ,
+            isHost:true
+        })
+    }
+    /* 运营人员管理-添加 */
+    PostAddOperator (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/operation/save', 
+            data, 
+            isLoading: true ,
+            isHost:true
+        })
+    }
+    /* 运营人员管理-删除 */
+    PostDeleteOperator (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/operation/delete', 
+            data, 
+            isLoading: true ,
+            isHost:true
+        })
+    }
+    /* 运营人员管理-更新邀请码 */
+    PostUpdateOperatorCode (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/operation/code/update', 
+            data, 
+            isLoading: true ,
+            isHost:true
+        })
+    }
+    /* 机构购物车简单列表*/
+    GetUserCartNumber (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/shoppingCart/header/cart', 
+            data, 
+            isLoading: true ,
+        })
+    }
+    /**
 	 *@协销帮机构注册 待注册列表
 	 *@param userId	协销用户userId
 	 *@param searchName 关键词
 	 *@param pageNum 页码
 	 *@param pageSize 条数
 	 */
-	SellerUserTemporaryClub (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/user/seller/temporary/club', 
-			data, 
-			isLoading: true ,
-			isHost:true
-		})
-	}
-	/**
+    SellerUserTemporaryClub (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/seller/temporary/club', 
+            data, 
+            isLoading: true ,
+            isHost:true
+        })
+    }
+    /**
 	 *@协销待注册列表 删除操作
 	 *@param ID
 	 */
-	SellerDeleteUserTemporaryClub (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/seller/delete/temporary/club', 
-			data, 
-			isLoading: true ,
-			isHost:true
-		})
-	}
-	/**
+    SellerDeleteUserTemporaryClub (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/seller/delete/temporary/club', 
+            data, 
+            isLoading: true ,
+            isHost:true
+        })
+    }
+    /**
 	 *@获取采美豆状态 
 	 *@userId userId
 	 */
-	GetHomeObtainBeans (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/user/club/obtain/beans', 
-			data, 
-			isLoading: false,
-			isHost:true
-		})
-	}
-	/**
+    GetHomeObtainBeans (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/club/obtain/beans', 
+            data, 
+            isLoading: false,
+            isHost:true
+        })
+    }
+    /**
 	 *@获取机构个人中心
 	 *@userId userId
 	 */
-	GetClubObtainCenter (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/user/club/home', 
-			data, 
-			isLoading: false,
-			isHost:true
-		})
-	}
-	/**
+    GetClubObtainCenter (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/club/home', 
+            data, 
+            isLoading: false,
+            isHost:true
+        })
+    }
+    /**
 	 *@机构采美豆收支明细 
 	 *@param userId	机构用户userId
 	 *@param year 年份
@@ -339,12 +339,63 @@ export default class UserService {
 	 *@param pageNum 页码
 	 *@param pageSize 条数
 	 */
-	GetUserClubBeansList (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/user/club/beans/history', 
-			data, 
-			isLoading: false,
-			isHost:true
-		})
-	}
+    GetUserClubBeansList (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/club/beans/history', 
+            data, 
+            isLoading: false,
+            isHost:true
+        })
+    }
+    /**
+	 *@机构资料备注列表 
+	 *@param clubId	机构用户clubId
+	 *@param pageNum 页码
+	 *@param pageSize 条数
+	 */
+    getUserClubRemarksList (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/club/remarks/list', 
+            data, 
+            isLoading: true,
+            isHost:true
+        })
+    }
+    /**
+	 *@机构资料备注保存
+	 *@param clubId	机构用户clubId
+	 */
+    getUserClubRemarksSave (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/club/remarks/save', 
+            data, 
+            isLoading: true,
+            isHost:true
+        })
+    }
+    /**
+	 *@机构资料备注详情
+	 *@param remarksId	备注Id
+	 */
+    getUserClubRemarksDetail (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/club/remarks/detail', 
+            data, 
+            isLoading: true,
+            isHost:true
+        })
+    }
+    /**
+	 *@机构资料备注删除
+	 *@param remarksId	备注Id
+	 */
+    getUserClubRemarksDelete (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/club/remarks/delete', 
+            data, 
+            isLoading: true,
+            isHost:true
+        })
+    }
+	
 }