From de920312841ae1b21f1dc5df7a82066c80cae3d4 Mon Sep 17 00:00:00 2001
From: zhangyouji <zhangyouji@sdxkhlw.cn>
Date: Thu, 28 Mar 2024 09:43:43 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/packageIntegral/productList.js            |  49 ++
 packageIntegral/components/mulpicker.vue      |  40 +-
 packageIntegral/productAddition/index.vue     | 429 ++++++++++++--
 .../productAddition/productAddStep2.vue       | 122 +++-
 packageIntegral/productList/index.vue         | 156 ++++--
 packageIntegral/takeGoods/index.vue           |   2 +-
 pages/stationDetail/ZYSite.vue                |   2 +-
 uni_modules/uni-data-select/changelog.md      |  37 ++
 .../uni-data-select/uni-data-select.vue       | 527 ++++++++++++++++++
 uni_modules/uni-data-select/package.json      |  85 +++
 uni_modules/uni-data-select/readme.md         |   8 +
 11 files changed, 1301 insertions(+), 156 deletions(-)
 create mode 100644 api/packageIntegral/productList.js
 create mode 100644 uni_modules/uni-data-select/changelog.md
 create mode 100644 uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
 create mode 100644 uni_modules/uni-data-select/package.json
 create mode 100644 uni_modules/uni-data-select/readme.md

diff --git a/api/packageIntegral/productList.js b/api/packageIntegral/productList.js
new file mode 100644
index 0000000..746fa8a
--- /dev/null
+++ b/api/packageIntegral/productList.js
@@ -0,0 +1,49 @@
+import request from '@/utils/request'
+
+export default{
+	productByPage(data) { // 商品分页查询
+		return request({
+			url: `/oil-mall/mobile/productByPage`,
+			method: 'post',
+			data
+		})
+	},
+	getTopInfo() {  // 获取头部信息
+		return request({
+			url: `/oil-mall/mobile/getTopInfo`,
+			method: 'get',
+		})
+	},
+	productStatus(data) { // 上下架接口
+		return request({
+			url: `/oil-mall/mobile/productStatus`,
+			method: 'post',
+			data
+		})
+	},
+	productAuditHistory(data) { // 审核信息接口
+		return request({
+			url: `/oil-mall/mobile/productAuditHistory`,
+			method: 'post',
+			data
+		})
+	},
+	classification() { // 商品分类-树形接口
+		return request({
+			url: `/oil-mall/mobile/classification`,
+			method: 'get',
+		})
+	},
+	getProductBrands() { // 品牌信息接口
+		return request({
+			url: `/oil-mall/mobile/getProductBrands`,
+			method: 'get',
+		})
+	},
+	getAttributesType() { // 属性类型接口
+		return request({
+			url: `/oil-mall/mobile/getAttributesType`,
+			method: 'get',
+		})
+	},
+}
\ No newline at end of file
diff --git a/packageIntegral/components/mulpicker.vue b/packageIntegral/components/mulpicker.vue
index eb1b465..b180403 100644
--- a/packageIntegral/components/mulpicker.vue
+++ b/packageIntegral/components/mulpicker.vue
@@ -19,7 +19,7 @@
             pidkey: { default: 'pid' },            // 对应父id取值
             placeholder: { default: '请选择' },
             emitPath: { default: false, type: Boolean },  // 是否子父级关联 ，是的时候返回的是逗号分隔的父子code
-            level: { default: 3, type: Number }    // 列数 2或者3
+            level: { default: 2, type: Number }    // 列数 2或者3
         },
         data() {
             return {
@@ -30,21 +30,20 @@
         },
         methods: {
             handleColumnChange(e) {
-                
                 let columnindex = e.detail.value; // 拖动列索引
                 switch (e.detail.column) {
                     case 0: //拖动第1列
-                    
+
                         // 第二级
                         let arr1 = this.multiArray[0];
                         this.multiArray[1] = arr1[columnindex][this.childkey]||[];
-                        
+
                         if(this.level === 3) {
                             // 第三级
                             let arr2 = this.multiArray[1];
                             this.multiArray[2] = arr2[0][this.childkey]||[];
                         }
-                        
+
                         this.multiIndex.splice(0, 1, columnindex)
                         this.multiIndex.splice(1, 1, 0)
                         this.multiIndex.splice(2, 1, 0)
@@ -55,14 +54,14 @@
                             let arr3 = this.multiArray[1];
                             this.multiArray[2] = arr3[columnindex][this.childkey]||[];
                         }
-                        
+
                         this.multiIndex.splice(1, 1, columnindex)
                         this.multiIndex.splice(2, 1, 0)
                         break
                 }
-                
+
             },
-            // 
+            //
             pickerChange(e) {
                 let multiIndex = e.detail.value;
                 if(this.emitPath) {
@@ -75,21 +74,19 @@
                     }
                     let code = codeArr.join(',');
                     this.name = nameArr.join('/');
-                    console.log('code1',code);
                     this.$emit('input', code)
                 }else {
-            
+
                     let curArr = this.multiArray[2], code='';
                     if(curArr && curArr.length) {
                         code = curArr[multiIndex[2]][this.code];
                         this.name = curArr[multiIndex[2]][this.rangekey];
-                    }else { 
+                    }else {
                         curArr = this.multiArray[1]
                         code = curArr[multiIndex[1]][this.code];
                         this.name = curArr[multiIndex[1]][this.rangekey];
                     }
-                    
-                    console.log('code2',code);
+
                     this.$emit('input', code)
                 }
             },
@@ -104,7 +101,7 @@
                     // 第三级
                     let arr2 = this.multiArray[1];
                     this.multiArray.push(arr2[this.multiIndex[1]][this.childkey]||[]);
-                    
+
                 }
             },
             curDataFind (data, code) {
@@ -151,16 +148,17 @@
           list: {
                 immediate: true,
                 handler(val) {
-					console.log(val)
-                    this.dataInit();
-                    this.initName();
+					if(JSON.stringify(val) != '[]'){
+						this.dataInit();
+						this.initName();
+					}
+                    
                 }
             },
           value: {
                 // immediate: true,
                 handler(val) {
-					console.log(val)
-                    this.initName();                
+                    this.initName();
                 }
           },
         }
@@ -168,5 +166,5 @@
 </script>
 
 <style lang="scss" scoped>
-    
-</style>
\ No newline at end of file
+
+</style>
diff --git a/packageIntegral/productAddition/index.vue b/packageIntegral/productAddition/index.vue
index 04a0c16..61b3b60 100644
--- a/packageIntegral/productAddition/index.vue
+++ b/packageIntegral/productAddition/index.vue
@@ -5,39 +5,44 @@
 			<block slot="content">新增商品</block>
 		</cu-custom>
     <view id="chooseType" :class="currentBoxId == 'chooseType' ? 'show' : 'hidden'">
-		<uni-forms ref="productForm" :modelValue="productDate" label-width="200rpx">
+		<uni-forms ref="productForm" :modelValue="productDate" :rules="rules" label-width="200rpx">
 					<uni-forms-item label="商品分类:" name="name">
 						<mulpicker
 						        v-model="productDate.demandRegion"
 						        :list="productList" 
-						    rangekey="name"
+						    rangekey="categoryName"
 						    code="id"
-						    pidkey="pid" 
-						    childkey="city" 
+						    pidkey="id" 
+						    childkey="classificationTwoList" 
 						    :emitPath="true"
 						    :level="2"
 						    :placeholder="'选择商品分类'"
 						/>
 						<uni-icons color="#666666" type="right" size="22" style="position: absolute;right: 0;top: 10rpx;"></uni-icons>
 					</uni-forms-item>
-					<uni-forms-item label="商品名称:" name="age">
-						<input type="text" v-model="productDate.age" placeholder="请输入" />
+					<uni-forms-item label="商品名称:" name="productName">
+						<input type="text" v-model="productDate.productName" placeholder="请输入商品名称" />
 					</uni-forms-item>
-					<uni-forms-item label="关键词:" name="age">
-						<input type="text" v-model="productDate.age" placeholder="请输入" />
+					<uni-forms-item label="关键词:" name="keyword">
+						<input type="text" v-model="productDate.keyword" placeholder="请输入关键词(空格分隔)" />
 					</uni-forms-item>
-					<uni-forms-item label="商品品牌:" name="age">
-						<input type="text" v-model="productDate.age" placeholder="请输入" />
+					<uni-forms-item label="商品品牌:" name="brandId">
+						<!-- <input type="text" v-model="productDate.brandId" placeholder="请输入商品品牌" /> -->
+						  <uni-data-select
+						        v-model="productDate.brandId"
+						        :localdata="brandIdList"
+								placeholder="请选择商品品牌"
+						      ></uni-data-select>
 					</uni-forms-item>
-					<uni-forms-item label="商品售价:" name="age">
-						<input type="text" v-model="productDate.age" placeholder="请输入" />
+					<uni-forms-item label="商品售价:" name="price">
+						<input type="text" v-model="productDate.price" placeholder="请输入商品售价" />
 					</uni-forms-item>
-					<uni-forms-item label="商品上架:" name="age">
-						<switch color="#FE0606" checked style="transform:scale(0.7)" />
+					<uni-forms-item label="商品上架:" name="productStatus">
+						<switch v-model="productDate.productStatus" color="#FE0606" checked style="transform:scale(0.7)" />
 					</uni-forms-item>
 					<uni-forms-item label="商品推荐:" name="age">
 						<view class='checkbox-con'>
-						 <radio-group @change="checkboxChange">
+						 <radio-group>
 						  <label :class="item.checked?'checkbox checked':'checkbox'" @click="checkbox(index)" v-for="(item, index) in radioItem" :key="item.value">
 						  <checkbox :value="item.value" :checked="item.checked"/>{{item.name}}
 						  </label>
@@ -53,10 +58,78 @@
 		
  
     <view id="instruction" :class="currentBoxId == 'instruction' ? 'show' : 'hidden'">
-        <productAddStep2 />
+        <!-- <productAddStep2 /> -->
+		<uni-forms :modelValue="productDate" label-width="200rpx">
+					<uni-forms-item label="属性类别:" >
+						  <uni-data-select
+						        v-model="productDate.attributesTypeId"
+						        :localdata="attributesTypeList"
+								placeholder="请选择商品品牌"
+								@change="attributesData"
+						      ></uni-data-select>
+					</uni-forms-item>
+				<view class="content" v-show="productDate.attributesTypeId">
+					<view>商品类型：</view>
+					<view>
+						<uni-section type="line">
+									<view class="uni-px-5" v-for="(item,index) in attributesList">
+										<view style="display: inline-block;">{{item.attributeName}}：</view>
+										<view  style="display: inline-block;">
+											<uni-data-checkbox v-if="index==0" mode="tag" v-model="radioAttributes" :localdata="item.attributesList"></uni-data-checkbox>
+										<uni-data-checkbox v-else-if="index!=0" mode="tag" multiple v-model="checkboxAttributes" :localdata="hobby"></uni-data-checkbox>
+										</view>
+										
+									</view>
+								</uni-section>
+					</view>
+				</view>
+				<view>
+					<view>批量填充：<text style="color: #999999;">批量填充填入信息后，可以批量将内容填写到SKU 信息里</text></view>
+					<view class="tagButton" v-for="item in bottonList">{{item.label}}</view>
+					<view class="redButton">确定</view>
+				</view>
+				<view v-if="productDate.attributesTypeId&&checkboxAttributes.length>0" v-for="(items,index) in checkboxAttributes">
+					<view>
+						<text style="color: red;">*</text>
+						<text>规格：</text>
+						<text>{{radioAttributes}}+{{items}}</text>
+					</view>
+					<view class="tagButton" v-for="items in bottonList">{{item.label}}</view>
+					<view style="display: inline-block;" @click="deleteCheckAll(index)">删除</view>
+				</view>
+				<view v-if="productDate.attributesTypeId&&radioAttributes" >
+					<view>
+						<text style="color: red;">*</text>
+						<text>规格：</text>
+						<text>{{radioAttributes}}</text>
+					</view>
+					<view class="tagButton" v-for="item in bottonList">{{item.label}}</view>
+					<view style="display: inline-block;" @click="deleteRadio">删除</view>
+				</view>
+				<view>
+					<view>
+						<text style="color: red;">*</text>
+						商品图片：<text style="color: #999999;">最多可上传10张图片</text></view>
+						<view>
+							<view class="imageBlack">商品主图</view>
+							<view class="imageBlack">设为主图</view>
+							<view class="imageBlack" @tap="srcFileImage">
+								<view style="cameraImage">
+									<uni-icons type="camera-filled" size="30"></uni-icons>
+								</view>
+								
+							</view>
+						</view>
+					
+				</view>
+				<view>
+					<view>详情图片：<text style="color: #999999;">最多可上传10张图片</text></view>
+					<view></view>
+				</view>
+				</uni-forms>
 		<view class="buttons">
 			<view id="previous"  @click="changeBox">上一步</view>
-        <view @click="addCompleted">完成</view>
+			<view @click="addCompleted">完成</view>
 		</view>
     </view>
  
@@ -67,7 +140,8 @@
 </template>
 
 <script>
-	import serve from '@/api/packageIntegral/orderList.js'
+	import utils from '@/utils/encode'
+	import serve from '@/api/packageIntegral/productList.js'
 	import mulpicker from '@/packageIntegral/components/mulpicker.vue'
 	import productAddStep2 from '@/packageIntegral/productAddition/productAddStep2.vue'
 	export default {
@@ -80,60 +154,88 @@
 				currentBoxId: 'instruction', //当前显示的view的id
 				isBoxShow: false,
 				productDate:{},
-				productList:[{
-		    "name": "北京市",
-			'id':'0',
-		    "city": [{
-					'name':"东城区",
-					'id':'1',
-				},{
-					'name':"西城区",
-					'id':'2',
-				},{
-					'name':"崇文区",
-					'id':'3',
-				},{
-					'name':"宣武区",
-					'id':'4',
-				},{
-					'name':"朝阳区",
-					'id':'5',
-				}
-		    ]
-		  }],
-		  radioItem:[{
+				productList:[],
+				brandIdList:[],
+				radioItem:[{
 					  name: '新品',
 					  checked: true
 					 }, {
 					  name: '推荐',
 					  checked: false
-					 }]
+					 }],
+					 rules:{
+						 name:{rules:[{required: true,errorMessage: '请选择商品分类'}]},
+						 productName:{rules:[{required: true,errorMessage: '请输入商品名称'}]},
+						 brandId:{rules:[{required: true,errorMessage: '请输入商品品牌'}]},
+						 price:{rules:[{required: true,errorMessage: '请输入商品售价'}]},
+					 },
+					 attributesTypeList:[],
+					 attributesList:[],
+					 bottonList:[
+					 	{label:'市场价格',value:'marketPrice'},
+					 	{label:'销售价格',value:'sellPrice'},
+					 	{label:'商品库存',value:'stock'},
+					 	{label:'兑换积分',value:'integral'}
+					 ],
+					 radioAttributes:'',
+					 checkboxAttributes:[]
 			}
 		},
 
 		onLoad(options) {
 			// this.get(options.orderId)
+			this.classfication()
+			this.getProductBrands()
+			this.getAttributesType()
+		},
+		watch:{
+			'productDate.demandRegion'(val){
+				if(val){
+					this.productDate.categoryOneId = val.split(',')[0]
+					this.productDate.categoryTwoId = val.split(',')[1]
+				}
+			}
 		},
 		methods: {
+			classfication(){
+				serve.classification().then(res=>{
+					this.productList = res.data
+				})
+			},
+			getProductBrands(){
+				this.brandIdList = []
+				serve.getProductBrands().then(res=>{
+					console.log(res)
+					res.data.forEach(tab=>{
+						this.brandIdList.push({value:tab.id,text:tab.brandName})
+					})
+					
+				})
+			},
 			checkbox (e) {
-				console.log(e)
 				 var index = e;//获取当前点击的下标
 				 var checkboxArr = this.radioItem;//选项集合
-				 if (checkboxArr[index].checked) return;//如果点击的当前已选中则返回
-				 checkboxArr.forEach(item => {
-				  item.checked = false
-				 })
-				 checkboxArr[index].checked = true;//改变当前选中的checked值
-				 // this.setData({
-				 //  checkboxArr: checkboxArr
-				 // });
+				 // if (checkboxArr[index].checked) return;//如果点击的当前已选中则返回
+				 // checkboxArr.forEach(item => {
+				 //  item.checked = false
+				 // })
+				 if(checkboxArr[index].checked ==false){
+					 checkboxArr[index].checked = true; //改变当前选中的checked值
+
+				 }else {
+					 checkboxArr[index].checked = false; //改变当前选中的checked值
+				 }
+				 if(checkboxArr[0].checked ==true){
+					 this.productDate.newMark = 1
+				 }else{
+					 this.productDate.newMark = 2
+				 }
+				 if(checkboxArr[1].checked ==true){
+					 this.productDate.recommend = 1
+				 }else{
+					 this.productDate.recommend = 2
+				 }
 		
-			 },
-			 checkboxChange (e) {
-			 var checkValue = e.detail.value;
-			 // this.setData({
-			 //  checkValue: checkValue
-			 // });
 			 },
 			  changeBox(e){
 			    let currentFlag = e.currentTarget.id;
@@ -148,6 +250,153 @@
 			            this.currentBoxId = 'viewInstruction'
 			          break;
 			    }
+				if(currentFlag == 'next'){
+					this.getAttributesType()
+				}
+			  },
+			  getAttributesType(){
+				  this.attributesTypeList = []
+				serve.getAttributesType().then(res=>{
+					res.data.forEach(tab=>{
+						this.attributesTypeList.push({
+							value:tab.id,
+							text:tab.name,
+							number:tab.number,
+							attributesList:tab.attributesList
+							})
+					})
+				})  
+			  },
+			  attributesData(){
+				  if(this.productDate.attributesTypeId){
+					this.attributesTypeList.forEach(tab=>{
+					  if(tab.id = this.productDate.attributesTypeId){
+						  this.attributesList = tab.attributesList
+						  this.attributesList.forEach(tab=>{
+							  tab.attributesList = []
+							  tab.attributeContent.split(',').forEach(item=>{
+								  tab.attributesList.push({value:item,text:item})
+							  })
+						  })
+						  
+					  }
+				  })  
+				  }else{
+					  this.attributesList = []
+				  }
+				  
+			  },
+			  deleteCheckAll(i){
+				  if(this.checkboxAttributes.length>1){
+					  this.checkboxAttributes.splice(i,1)
+				  }else{
+					  this.checkboxAttributes.splice(i,1)
+					  this.radioAttributes = ''
+				  }
+			  },
+			  deleteRadio(){
+				  this.radioAttributes = ''
+			  },
+			   // 调用系统相机
+			      takePhoto() {
+			        // 先检查权限
+					let _that = this
+			        uni.getSetting({
+			          success(res) {
+			            if (!res.authSetting['scope.camera']) {
+			              // 请求权限
+			              uni.authorize({
+			                scope: 'scope.camera',
+			                success() {
+			                  // 权限已经获取，可以调用相机
+			                  _that.srcFileImage()
+			                },
+			                fail() {
+			                  // 用户拒绝授权，需引导用户开启权限
+			                  uni.showModal({
+			                    title: '提示',
+			                    content: '需要相机权限才能使用相机功能，请在设置中打开',
+			                    success: (modalRes) => {
+			                      if (modalRes.confirm) {
+			                        // 引导用户去设置中打开权限
+			                        wx.openSetting({
+			                        	success(res) {
+			                        		if (res.authSetting['scope.camera']) {
+			                        			re()
+			                        			// 授权成功，重新定位
+			                        		} else {
+			                        			// 没有允许定位权限
+			                        			wx.showToast({
+			                        				title: '您拒绝了相机权限，将无法使用相机功能',
+			                        				icon: 'none'
+			                        			});
+			                        			rj('拒绝了相机权限')
+			                        		}
+			                        	},
+			                        	fail() {
+			                        		rj('openSetting调用失败')
+			                        	}
+			                        })
+			                      }
+			                    },
+			                  });
+			                },
+			              });
+			            } else {
+			              // 权限已经获取，可以直接调用相机
+			              _that.srcFileImage()
+			            }
+			          },
+			          fail(err) {
+			            // 获取设置失败
+			            console.error(err);
+			          },
+			        });
+			      },
+			  //调起上传图片
+			  srcFileImage() {
+			  	let _that = this
+			  	uni.chooseImage({
+			  		count: 10, //默认9
+			  		sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+			  		sourceType: ['album'], //从相册选择
+			  		success: function(res) {
+			  			console.log(res)
+			  			console.log('进入1')
+			  			const JSESSIONID = utils.uuid()
+			  			uni.uploadFile({
+			  				url: 'http://uat.xingoil.com/adminapi/oil-oss/obejct/uploadFile',
+			  				filePath: res.tempFilePaths[0],
+			  				formData: {
+			  					ossKey: 'xingyou',
+			  					pathKey: 'publicxingyou',
+			  					encrypt: 'PUBLIC',
+			  				},
+			  				name: 'file',
+			  				header: {
+			  					"Content-Type": "multipart/form-data",
+			  					"Authorization": uni.getStorageSync('Authorization'),
+			  					'dataSources': 'MP',
+			  					"imei": uni.getStorageSync('unionid'),
+			  					"openId": uni.getStorageSync('openid'),
+			  					'JSESSIONID': JSESSIONID,
+			  					'token': utils.md5Salt(JSESSIONID)
+			  				},
+			  				success(e) {
+			  					console.log('进入2')
+			  					console.log(e)
+			  					let obj = JSON.parse(e.data),
+			  						url = obj.data.publicUrl
+									console.log(obj.data.publicUrl)
+			  				},
+							fail(err) {
+								console.log(err)
+							}
+			  			})
+			  		},fail() {
+			  			console.log('相机调用失败')
+			  		}
+			  	})
 			  },
 			  picker2(e){
 				  console.log(e.detail.value)
@@ -181,6 +430,12 @@
 		/deep/ .uni-forms{
 			width: 100%;
 		}
+		.content{
+			font-size: 28rpx;
+			font-weight: bold;
+		}
+		
+		
 		/deep/ .uni-forms-item{
 			width: 100%;
 		}
@@ -208,6 +463,68 @@
 			 content: '';
 		 }	
 		}
+		#instruction{
+			padding: 30rpx;
+			
+			mulpicker{
+				height: 72rpx;
+				line-height: 72rpx;
+			}
+			/deep/ .uni-forms{
+				width: 100%;
+			}
+			/deep/ .uni-forms-item{
+				width: 100%;
+			}
+			
+			/deep/ .uni-forms-item__label{
+				color: #333 !important;
+				font-size: 30rpx;
+				font-weight: 700;
+			}
+			/deep/ .uni-forms-item__content{
+				width: 100%;
+				input{
+					height: 72rpx;
+					line-height: 72rpx;
+				}
+			}
+			.tagButton{
+				display: inline-block;
+				width: 133rpx;
+				height: 58rpx;
+				background: #f5f5f5;
+				color: #666666;
+				border-radius: 8rpx;
+				line-height: 58rpx;
+				text-align: center;
+				margin: 8rpx;
+			}
+			.redButton{
+				display: inline-block;
+				width: 84rpx;
+				height: 58rpx;
+				background: red;
+				color: #fff;
+				border-radius: 10rpx;
+				line-height: 58rpx;
+				text-align: center;
+			}
+			.imageBlack{
+				display: inline-block;
+				width: 140rpx;
+				height: 140rpx;
+				line-height: 140rpx;
+				// position: relative;
+				.cameraImage{
+					// position: absolute;
+					// left: 70rpx;
+					// top: 70rpx;
+				}
+			}
+			
+		}
+		
 		.checkbox-con{
 		 margin-top: 40rpx;
 		 text-align: center;
diff --git a/packageIntegral/productAddition/productAddStep2.vue b/packageIntegral/productAddition/productAddStep2.vue
index fa962aa..bd45224 100644
--- a/packageIntegral/productAddition/productAddStep2.vue
+++ b/packageIntegral/productAddition/productAddStep2.vue
@@ -3,14 +3,50 @@
 		
 		<view class="body">
 			<view class="bodyContent">
-				<view class="bodyLabel">属性类型：</view>
-				<view class="bodyItem">
-					<uni-data-select
-					      v-model="value"
-					      :localdata="range"
-					      @change="change"
-					    ></uni-data-select>
+							<uni-collapse ref="collapse">
+								<uni-collapse-item title="属性类型:" style="width: 700rpx;">
+									<view class="content">
+										<view>商品类型：</view>
+										<view>
+											<uni-section type="line">
+														<view class="uni-px-5">
+															<view style="display: inline-block;">尺码：</view>
+															<uni-data-checkbox mode="tag" v-model="radio" :localdata="range"></uni-data-checkbox>
+														</view>
+														<view class="uni-px-5 uni-pb-5">
+															<view style="display: inline-block;">颜色：</view>
+															<uni-data-checkbox mode="tag" multiple v-model="checkbox" :localdata="hobby"></uni-data-checkbox>
+														</view>
+													</uni-section>
+										</view>
+									</view>
+								</uni-collapse-item>
+							</uni-collapse>
+			</view>
+			<view>
+				<view>批量填充：<text style="color: #999999;">批量填充填入信息后，可以批量将内容填写到SKU 信息里</text></view>
+				<view class="tagButton" v-for="item in bottonList">{{item.label}}</view>
+				<view class="redButton">确定</view>
+			</view>
+			<view>
+				<view>
+					<text style="color: red;">*</text>
+					<text>规格</text>
+					<text>M+红色</text>
 				</view>
+				<view class="tagButton" v-for="item in bottonList">{{item.label}}</view>
+				<view style="display: inline-block;">删除</view>
+			</view>
+			<view>
+				<text style="color: red;">*</text>
+				<text>商品图片</text>
+				<text>最多可上传10张图片</text>
+				<view></view>
+			</view>
+			<view>
+				<text>详情图片</text>
+				<text>最多可上传10张图片</text>
+				<view></view>
 			</view>
 		</view>
 		
@@ -21,18 +57,46 @@
 	export default{
 		data(){
 			return{
-				value: 1,
+				radio: 0,
 		        range: [
-		          { value: 0, text: "篮球" },
-		          { value: 1, text: "足球" },
-		          { value: 2, text: "游泳" },
+		          {
+					text: 'M',
+					value: 0
+				}, {
+					text: 'X',
+					value: 1
+				}, {
+					text: 'XL',
+					value: 2
+				}, {
+					text: '2XL',
+					value: 3
+				},
 		        ],
+				checkbox:[0],
+				hobby: [{
+					text: '黑色',
+					value: 0
+				}, {
+					text: '红色',
+					value: 1
+				}, {
+					text: '白色',
+					value: 2
+				}, {
+					text: '蓝色',
+					value: 3
+				}],
+				bottonList:[
+					{label:'市场价格'},
+					{label:'销售价格'},
+					{label:'商品库存'},
+					{label:'兑换积分'}
+				]
 			}
 		},
 		methods:{
-			change(e) {
-			        console.log("e:", e);
-			      },
+			
 		}
 	}
 </script>
@@ -41,15 +105,33 @@
 	.container{
 		.body{
 			padding: 30rpx;
+			width: 100%;
 		}
 	}
 	.bodyContent{
-		position: relative;
-		// padding-left:150rpx;
-		.bodyLabel{
-			display: inline-block;
-			width: 150rpx;
-		}
+		width: 100%;
+		
+	}
+	.tagButton{
+		display: inline-block;
+		width: 133rpx;
+		height: 58rpx;
+		background: #f5f5f5;
+		color: #666666;
+		border-radius: 10rpx;
+		line-height: 58rpx;
+		text-align: center;
+		margin: 10rpx;
+	}
+	.redButton{
+		display: inline-block;
+		width: 84rpx;
+		height: 58rpx;
+		background: red;
+		color: #fff;
+		border-radius: 10rpx;
+		line-height: 58rpx;
+		text-align: center;
 	}
 	
 </style>
\ No newline at end of file
diff --git a/packageIntegral/productList/index.vue b/packageIntegral/productList/index.vue
index 54e62db..b02a0a1 100644
--- a/packageIntegral/productList/index.vue
+++ b/packageIntegral/productList/index.vue
@@ -9,29 +9,31 @@
 			<view v-for="item,index in optionsList" :key="index" :class="index == currentIndex ? 'active':''"
 				@click="selectOptions(index)">{{item.text}}<text>({{item.count}})</text></view>
 		</view>
-
 		<view class="search">
-			<uni-easyinput prefixIcon="search"  v-model="paramter.customerphone" placeholder="请输入手机号后四位"
-				@confirm="search" maxlength="4" />
+			<uni-easyinput prefixIcon="search" borderColor="#DCDFE6" v-model="paramter.params.productName" placeholder="请输入商品名称"
+				@confirm="search"  @clear="search" />
 		</view>
 
+
 		<scroll-view v-if="dataList.length" class="list" :scroll-y="true" @scrolltolower="lower">
 			<view class="item" v-for="item,index in dataList" :key="index">
 				<view class="header" @click="toDetails(item)">
-					<view class="identifying" :style="{background:identifying[1].background,opacity:identifying[1].opacity}">已上架</view>
+					<view class="identifying"
+					 :style="{background:identifying[item.productStatus].background,
+					 opacity:identifying[item.productStatus].opacity}">{{item.productStatus =='1'?'已上架':'未上架'}}</view>
 				</view>
 				<view class="introduce" @click="toDetails(item)">
-					<image :src="item.oderDetailImg"></image>
+					<image :src="item.url"></image>
 					<view>{{item.productName}}</view>
 					<view>规格：默认</view>
-					<view>￥{{item.marketPrice}} X{{item.orderNum}}</view>
-					<view>库存：{{item.orderNum}}</view>
+					<view>库存：{{item.totalStock}}</view>
 				</view>
-				<view class="examine" @click="examineDetail" :style="{background:statusEnum[1].color}" >{{statusEnum[1].value}}</view>
+				<view class="examine" @click="examineDetail(item)"
+				 :style="{background:statusEnum[item.auditStatus].color}" >{{statusEnum[item.auditStatus].value}}</view>
 				<view class="footer">
 					<view class="button" @click="orderDelete">删除</view>
 					<view class="button">编辑</view>
-					<view class="button" @click="upDownFrame">上架</view>
+					<view class="button" @click="upDownFrame(item)">{{item.productStatus =='1'?'上架':'下架'}}</view>
 				</view>
 			</view>
 			<view style="height: 30rpx; background: #fff;"></view>
@@ -50,13 +52,13 @@
 						<view class="header">审核时间</view>
 						<view>{{item.createTime}}</view>
 					</view>
-					<view>
+					<view class="status">
 						<view class="header">审核结果</view>
-						<view>{{item.status}}</view>
+						<view>{{statusEnum[item.auditStatus].value}}</view>
 					</view>
 					<view>
 						<view class="header">反馈详情</view>
-						<view>{{item.dateil}}</view>
+						<view>{{item.remark}}</view>
 					</view>
 				</view>
 				<view class="buttons">
@@ -77,10 +79,10 @@
 
 		<uni-popup ref="popup">
 			<view class="determine-frame">
-				<view class="title">是否上架/下架该商品？</view>
+				<view class="title">是否{{productData.productStatus =='1'?'下架':'上架'}}该商品？</view>
 				<view class="buttons">
 					<view @click="$refs.popup.close()">取消</view>
-					<view>确认</view>
+					<view @click="submitProduct">确认</view>
 				</view>
 			</view>
 		</uni-popup>
@@ -89,7 +91,7 @@
 </template>
 
 <script>
-	import serve from '@/api/packageIntegral/orderList.js'
+	import serve from '@/api/packageIntegral/productList.js'
 
 	export default {
 		options: {
@@ -106,11 +108,9 @@
 				paramter: {
 					currentPage: 1,
 					pagesize: 20,
-					params: {
-						customerphone: ''
-					},
+					params: {},
 				},
-				dataList: [{},{},{}],
+				dataList: [],
 				optionsList: [{
 					text: '全部',
 					count: 0,
@@ -129,22 +129,18 @@
 					value: ''
 				}],
 				identifying:{
-					0: {
+					1: {
 						background: '#F83D3D',
 						opacity: 1,
 						value: "已上架"
 					},
-					1: {
+					2: {
 						background: '#F83D3D',
 						opacity: 0.5,
 						value: "待上架"
 					}
 				},
 				statusEnum: {
-					'-1': {
-						color: '#F83D3D',
-						value: "已驳回"
-					},
 					1: {
 						color: '#8D38FC',
 						value: "待审核"
@@ -153,34 +149,38 @@
 						color: '#FCB438',
 						value: "已审核"
 					},
+					3: {
+						color: '#F83D3D',
+						value: "已驳回"
+					},
 				},
-				examineDetailList:[
-					{
-						createTime:'2023.11.22',
-						status:'1',
-						dateil:'未审核'
-					},
-					{
-						createTime:'2023.11.23',
-						status:'2',
-						dateil:'已审核'
-					},
-					{
-						createTime:'2023.11.24',
-						status:'已驳回',
-						dateil:'图片不清晰，请重新上传图片'
-					}
-				]
+				examineDetailList:[],
+				productData:{}
 			}
 		},
 
 		onLoad() {
-			// this.getByPageCloudMini()
+			this.productByPage()
+			this.getTopInfo()
 		},
 
 		methods: {
 			selectOptions(index) {
 				this.currentIndex = index
+				console.log(index,'index')
+				if(index == 0){
+					this.paramter.params ={}
+				}else if(index ==1){
+					this.paramter.params ={}
+					this.paramter.params.productStatus = 1
+				}else if(index ==2){
+					this.paramter.params ={}
+					this.paramter.params.productStatus = 2
+				}else if(index ==3){
+					this.paramter.params ={}
+					this.paramter.params.auditStatus = 1
+				}
+				this.productByPage()
 			},
 			handler(json) {
 				json = json.replace(/'/g, '"')
@@ -197,12 +197,23 @@
 					url: `../orderDetails/index?orderId=${item.orderId}`
 				})
 			},
+			getTopInfo(){
+				serve.getTopInfo(this.paramter).then(res => {
+					if (res.code === 20000) {
+						this.optionsList[0].count = res.data.count
+						this.optionsList[1].count = res.data.availableCount
+						this.optionsList[2].count = res.data.noAvailableCount
+						this.optionsList[3].count = res.data.auditCount
+					}
+				})
+			},
 			search() {
 				this.paramter.currentPage = 1
-				this.getByPageCloudMini()
+				this.productByPage()
+				this.getTopInfo()
 			},
-			getByPageCloudMini() {
-				serve.getByPageCloudMini(this.paramter).then(res => {
+			productByPage() {
+				serve.productByPage(this.paramter).then(res => {
 					if (res.code === 20000) {
 						if (!res.data.list.length) {
 							uni.showToast({
@@ -220,17 +231,41 @@
 			},
 			lower() {
 				this.paramter.currentPage += 1
-				this.getByPageCloudMini()
+				this.productByPage()
 			},
-			examineDetail(){
+			examineDetail(item){
+				serve.productAuditHistory({id:item.id}).then(res=>{
+					this.examineDetailList = res.data
+				})
 				this.$refs.detail.open('center')
 			},
 			orderDelete(){
 				this.$refs.delete.open('center')
 			},
-			upDownFrame() {
+			upDownFrame(item) {
+				this.productData = item
 				this.$refs.popup.open('center')
 			},
+			submitProduct(){
+				let data = {}
+				data.id = this.productData.id
+				if(this.productData.productStatus ==1){
+					data.productStatus = 2
+				}else if(this.productData.productStatus ==2){
+					data.productStatus = 1
+				}
+				
+				serve.productStatus(data).then(res=>{
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					if (res.code !== 20000) return
+					this.$refs.popup.close()
+					this.productByPage()
+					this.getTopInfo()
+				})
+			},
 			confirm() {
 				this.controlWindows.code = false
 			}
@@ -249,6 +284,13 @@
 		flex-direction: column;
 		background: #fff;
 
+		>.search {
+			margin: 50rpx auto 0;
+			width: 689rpx;
+			height: 74rpx;
+			background: #FFF;
+
+		}
 		>.options-frame {
 			display: flex;
 			justify-content: space-between;
@@ -280,13 +322,6 @@
 			}
 		}
 
-		>.search {
-			margin: 50rpx auto 0;
-			width: 689rpx;
-			height: 74rpx;
-			background: #F7F7F7;
-
-		}
 
 		>.list {
 			margin-top: 35rpx;
@@ -439,9 +474,16 @@
 				color: #666;
 				padding: 10rpx;
 				view{
-					width: 200rpx;
+					width: 240rpx;
 					line-height: 46rpx;
 				}
+				>.status{
+					width: 160rpx;
+					>view{
+						width: 160rpx;
+					}
+				}
+				
 				.header{
 					font-size: 32rpx;
 					color: #000;
diff --git a/packageIntegral/takeGoods/index.vue b/packageIntegral/takeGoods/index.vue
index 1fd931f..aa977b6 100644
--- a/packageIntegral/takeGoods/index.vue
+++ b/packageIntegral/takeGoods/index.vue
@@ -132,7 +132,7 @@
 							icon: 'none'
 						});
 						this.$refs.popup.close();
-						this;getByPageCloudMini()
+						this.getByPageCloudMini()
 						uni.navigateTo({
 							url: `../orderDetails/index?orderId=${this.dataList[0].orderId}`
 						})
diff --git a/pages/stationDetail/ZYSite.vue b/pages/stationDetail/ZYSite.vue
index d1dc838..6e38cf8 100644
--- a/pages/stationDetail/ZYSite.vue
+++ b/pages/stationDetail/ZYSite.vue
@@ -727,7 +727,7 @@
 							filePath: res.tempFilePaths[0],
 							formData: {
 								ossKey: 'xingyou',
-								pathKey: 'publicxingyou ',
+								pathKey: 'publicxingyou',
 								encrypt: 'PUBLIC',
 							},
 							name: 'file',
diff --git a/uni_modules/uni-data-select/changelog.md b/uni_modules/uni-data-select/changelog.md
new file mode 100644
index 0000000..639b459
--- /dev/null
+++ b/uni_modules/uni-data-select/changelog.md
@@ -0,0 +1,37 @@
+## 1.0.7（2024-01-20）
+- 修复 长文本回显超过容器的bug，超过容器部分显示省略号
+## 1.0.6（2023-04-12）
+- 修复 微信小程序点击时会改变背景颜色的 bug
+## 1.0.5（2023-02-03）
+- 修复 禁用时会显示清空按钮
+## 1.0.4（2023-02-02）
+- 优化 查询条件短期内多次变更只查询最后一次变更后的结果
+- 调整 内部缓存键名调整为 uni-data-select-lastSelectedValue
+## 1.0.3（2023-01-16）
+- 修复 不关联服务空间报错的问题
+## 1.0.2（2023-01-14）
+- 新增  属性 `format` 可用于格式化显示选项内容
+## 1.0.1（2022-12-06）
+- 修复  当where变化时，数据不会自动更新的问题
+## 0.1.9（2022-09-05）
+- 修复 微信小程序下拉框出现后选择会点击到蒙板后面的输入框
+## 0.1.8（2022-08-29）
+- 修复 点击的位置不准确
+## 0.1.7（2022-08-12）
+- 新增 支持 disabled 属性
+## 0.1.6（2022-07-06）
+- 修复 pc端宽度异常的bug
+## 0.1.5
+- 修复 pc端宽度异常的bug
+## 0.1.4（2022-07-05）
+- 优化 显示样式
+## 0.1.3（2022-06-02）
+- 修复 localdata 赋值不生效的 bug
+- 新增 支持  uni.scss 修改颜色
+- 新增 支持选项禁用（数据选项设置 disabled: true 即禁用）
+## 0.1.2（2022-05-08）
+- 修复 当 value 为 0 时选择不生效的 bug
+## 0.1.1（2022-05-07）
+- 新增 记住上次的选项（仅 collection 存在时有效）
+## 0.1.0（2022-04-22）
+- 初始化
diff --git a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
new file mode 100644
index 0000000..26a6fe9
--- /dev/null
+++ b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
@@ -0,0 +1,527 @@
+<template>
+	<view class="uni-stat__select">
+		<span v-if="label" class="uni-label-text hide-on-phone">{{label + '：'}}</span>
+		<view class="uni-stat-box" :class="{'uni-stat__actived': current}">
+			<view class="uni-select" :class="{'uni-select--disabled':disabled}">
+				<view class="uni-select__input-box" @click="toggleSelector">
+					<view v-if="current" class="uni-select__input-text">{{textShow}}</view>
+					<view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view>
+					<view v-if="current && clear && !disabled" @click.stop="clearVal" >
+						<uni-icons type="clear" color="#c0c4cc" size="24"/>
+					</view>
+					<view v-else>
+						<uni-icons :type="showSelector? 'top' : 'bottom'" size="14" color="#999" />
+					</view>
+				</view>
+				<view class="uni-select--mask" v-if="showSelector" @click="toggleSelector" />
+				<view class="uni-select__selector" v-if="showSelector">
+					<view class="uni-popper__arrow"></view>
+					<scroll-view scroll-y="true" class="uni-select__selector-scroll">
+						<view class="uni-select__selector-empty" v-if="mixinDatacomResData.length === 0">
+							<text>{{emptyTips}}</text>
+						</view>
+						<view v-else class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData" :key="index"
+							@click="change(item)">
+							<text :class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * DataChecklist 数据选择器
+	 * @description 通过数据渲染的下拉框组件
+	 * @tutorial https://uniapp.dcloud.io/component/uniui/uni-data-select
+	 * @property {String} value 默认值
+	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
+	 * @property {Boolean} clear 是否可以清空已选项
+	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
+	 * @property {String} label 左侧标题
+	 * @property {String} placeholder 输入框的提示文字
+	 * @property {Boolean} disabled 是否禁用
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: "uni-data-select",
+		mixins: [uniCloud.mixinDatacom || {}],
+		props: {
+			localdata: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			label: {
+				type: String,
+				default: ''
+			},
+			placeholder: {
+				type: String,
+				default: '请选择'
+			},
+			emptyTips: {
+				type: String,
+				default: '无选项'
+			},
+			clear: {
+				type: Boolean,
+				default: true
+			},
+			defItem: {
+				type: Number,
+				default: 0
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 格式化输出 用法 field="_id as value, version as text, uni_platform as label" format="{label} - {text}"
+			format: {
+				type: String,
+				default: ''
+			},
+		},
+		data() {
+			return {
+				showSelector: false,
+				current: '',
+				mixinDatacomResData: [],
+				apps: [],
+				channels: [],
+				cacheKey: "uni-data-select-lastSelectedValue",
+			};
+		},
+		created() {
+			this.debounceGet = this.debounce(() => {
+				this.query();
+			}, 300);
+			if (this.collection && !this.localdata.length) {
+				this.debounceGet();
+			}
+		},
+		computed: {
+			typePlaceholder() {
+				const text = {
+					'opendb-stat-app-versions': '版本',
+					'opendb-app-channels': '渠道',
+					'opendb-app-list': '应用'
+				}
+				const common = this.placeholder
+				const placeholder = text[this.collection]
+				return placeholder ?
+					common + placeholder :
+					common
+			},
+			valueCom(){
+				// #ifdef VUE3
+				return this.modelValue;
+				// #endif
+				// #ifndef VUE3
+				return this.value;
+				// #endif
+			},
+			textShow(){
+				// 长文本显示
+				let text = this.current;
+				if (text.length > 10) {
+					return text.slice(0, 25) + '...';
+				}
+				return text;
+			}
+		},
+
+		watch: {
+			localdata: {
+				immediate: true,
+				handler(val, old) {
+					if (Array.isArray(val) && old !== val) {
+						this.mixinDatacomResData = val
+					}
+				}
+			},
+			valueCom(val, old) {
+				this.initDefVal()
+			},
+			mixinDatacomResData: {
+				immediate: true,
+				handler(val) {
+					if (val.length) {
+						this.initDefVal()
+					}
+				}
+			},
+
+		},
+		methods: {
+			debounce(fn, time = 100){
+				let timer = null
+				return function(...args) {
+					if (timer) clearTimeout(timer)
+					timer = setTimeout(() => {
+						fn.apply(this, args)
+					}, time)
+				}
+			},
+			// 执行数据库查询
+			query(){
+				this.mixinDatacomEasyGet();
+			},
+			// 监听查询条件变更事件
+			onMixinDatacomPropsChange(){
+				if (this.collection) {
+					this.debounceGet();
+				}
+			},
+			initDefVal() {
+				let defValue = ''
+				if ((this.valueCom || this.valueCom === 0) && !this.isDisabled(this.valueCom)) {
+					defValue = this.valueCom
+				} else {
+					let strogeValue
+					if (this.collection) {
+						strogeValue = this.getCache()
+					}
+					if (strogeValue || strogeValue === 0) {
+						defValue = strogeValue
+					} else {
+						let defItem = ''
+						if (this.defItem > 0 && this.defItem <= this.mixinDatacomResData.length) {
+							defItem = this.mixinDatacomResData[this.defItem - 1].value
+						}
+						defValue = defItem
+					}
+          if (defValue || defValue === 0) {
+					  this.emit(defValue)
+          }
+				}
+				const def = this.mixinDatacomResData.find(item => item.value === defValue)
+				this.current = def ? this.formatItemName(def) : ''
+			},
+
+			/**
+			 * @param {[String, Number]} value
+			 * 判断用户给的 value 是否同时为禁用状态
+			 */
+			isDisabled(value) {
+				let isDisabled = false;
+
+				this.mixinDatacomResData.forEach(item => {
+					if (item.value === value) {
+						isDisabled = item.disable
+					}
+				})
+
+				return isDisabled;
+			},
+
+			clearVal() {
+				this.emit('')
+				if (this.collection) {
+					this.removeCache()
+				}
+			},
+			change(item) {
+				if (!item.disable) {
+					this.showSelector = false
+					this.current = this.formatItemName(item)
+					this.emit(item.value)
+				}
+			},
+			emit(val) {
+				this.$emit('input', val)
+				this.$emit('update:modelValue', val)
+				this.$emit('change', val)
+				if (this.collection) {
+					this.setCache(val);
+				}
+			},
+			toggleSelector() {
+				if (this.disabled) {
+					return
+				}
+
+				this.showSelector = !this.showSelector
+			},
+			formatItemName(item) {
+				let {
+					text,
+					value,
+					channel_code
+				} = item
+				channel_code = channel_code ? `(${channel_code})` : ''
+
+				if (this.format) {
+					// 格式化输出
+					let str = "";
+					str = this.format;
+					for (let key in item) {
+						str = str.replace(new RegExp(`{${key}}`,"g"),item[key]);
+					}
+					return str;
+				} else {
+					return this.collection.indexOf('app-list') > 0 ?
+						`${text}(${value})` :
+						(
+							text ?
+							text :
+							`未命名${channel_code}`
+						)
+				}
+			},
+			// 获取当前加载的数据
+			getLoadData(){
+				return this.mixinDatacomResData;
+			},
+			// 获取当前缓存key
+			getCurrentCacheKey(){
+				return this.collection;
+			},
+			// 获取缓存
+			getCache(name=this.getCurrentCacheKey()){
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				return cacheData[name];
+			},
+			// 设置缓存
+			setCache(value, name=this.getCurrentCacheKey()){
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				cacheData[name] = value;
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+			// 删除缓存
+			removeCache(name=this.getCurrentCacheKey()){
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				delete cacheData[name];
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-base-color: #6a6a6a !default;
+	$uni-main-color: #333 !default;
+	$uni-secondary-color: #909399 !default;
+	$uni-border-3: #e5e5e5;
+
+
+	/* #ifndef APP-NVUE */
+	@media screen and (max-width: 500px) {
+		.hide-on-phone {
+			display: none;
+		}
+	}
+
+	/* #endif */
+	.uni-stat__select {
+		display: flex;
+		align-items: center;
+		// padding: 15px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+		width: 100%;
+		flex: 1;
+		box-sizing: border-box;
+	}
+
+	.uni-stat-box {
+		width: 100%;
+		flex: 1;
+	}
+
+	.uni-stat__actived {
+		width: 100%;
+		flex: 1;
+		// outline: 1px solid #2979ff;
+	}
+
+	.uni-label-text {
+		font-size: 14px;
+		font-weight: bold;
+		color: $uni-base-color;
+		margin: auto 0;
+		margin-right: 5px;
+	}
+
+	.uni-select {
+		font-size: 14px;
+		border: 1px solid $uni-border-3;
+		box-sizing: border-box;
+		border-radius: 4px;
+		padding: 0 5px;
+		padding-left: 10px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		user-select: none;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		border-bottom: solid 1px $uni-border-3;
+		width: 100%;
+		flex: 1;
+		height: 35px;
+
+		&--disabled {
+			background-color: #f5f7fa;
+			cursor: not-allowed;
+		}
+	}
+
+	.uni-select__label {
+		font-size: 16px;
+		// line-height: 22px;
+		height: 35px;
+		padding-right: 10px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__input-box {
+		height: 35px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.uni-select__input {
+		flex: 1;
+		font-size: 14px;
+		height: 22px;
+		line-height: 22px;
+	}
+
+	.uni-select__input-plac {
+		font-size: 14px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__selector {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		position: absolute;
+		top: calc(100% + 12px);
+		left: 0;
+		width: 100%;
+		background-color: #FFFFFF;
+		border: 1px solid #EBEEF5;
+		border-radius: 6px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		z-index: 3;
+		padding: 4px 0;
+	}
+
+	.uni-select__selector-scroll {
+		/* #ifndef APP-NVUE */
+		max-height: 200px;
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	/* #ifdef H5 */
+	@media (min-width: 768px) {
+		.uni-select__selector-scroll {
+			max-height: 600px;
+		}
+	}
+	/* #endif */
+
+	.uni-select__selector-empty,
+	.uni-select__selector-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		line-height: 35px;
+		font-size: 14px;
+		text-align: center;
+		/* border-bottom: solid 1px $uni-border-3; */
+		padding: 0px 10px;
+	}
+
+	.uni-select__selector-item:hover {
+		background-color: #f9f9f9;
+	}
+
+	.uni-select__selector-empty:last-child,
+	.uni-select__selector-item:last-child {
+		/* #ifndef APP-NVUE */
+		border-bottom: none;
+		/* #endif */
+	}
+
+	.uni-select__selector__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	/* picker 弹出层通用的指示小三角 */
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+
+	.uni-select__input-text {
+		// width: 280px;
+		width: 100%;
+		color: $uni-main-color;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+		overflow: hidden;
+	}
+
+	.uni-select__input-placeholder {
+		color: $uni-base-color;
+		font-size: 12px;
+	}
+
+	.uni-select--mask {
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+		z-index: 2;
+	}
+</style>
diff --git a/uni_modules/uni-data-select/package.json b/uni_modules/uni-data-select/package.json
new file mode 100644
index 0000000..47afe60
--- /dev/null
+++ b/uni_modules/uni-data-select/package.json
@@ -0,0 +1,85 @@
+{
+  "id": "uni-data-select",
+  "displayName": "uni-data-select 下拉框选择器",
+  "version": "1.0.7",
+  "description": "通过数据驱动的下拉框选择器",
+  "keywords": [
+    "uni-ui",
+    "select",
+    "uni-data-select",
+    "下拉框",
+    "下拉选"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.1"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-load-more"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "n"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+        "QQ": "u",
+        "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-data-select/readme.md b/uni_modules/uni-data-select/readme.md
new file mode 100644
index 0000000..eb58de3
--- /dev/null
+++ b/uni_modules/uni-data-select/readme.md
@@ -0,0 +1,8 @@
+## DataSelect 下拉框选择器
+> **组件名：uni-data-select**
+> 代码块： `uDataSelect`
+
+当选项过多时，使用下拉菜单展示并选择内容
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-select)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
-- 
2.49.1


From e7721ff978f2c15a9c12640f06c549b7b4fd93f6 Mon Sep 17 00:00:00 2001
From: zhangyouji <zhangyouji@sdxkhlw.cn>
Date: Thu, 28 Mar 2024 16:13:29 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/packageIntegral/productList.js            |  20 +
 packageIntegral/productAddition/index.vue     | 156 +++-
 .../productAddition/productAddStep2.vue       | 137 ----
 packageIntegral/productList/index.vue         |  11 +-
 packageIntegral/productUpdate/index.vue       | 684 ++++++++++++++++++
 5 files changed, 834 insertions(+), 174 deletions(-)
 delete mode 100644 packageIntegral/productAddition/productAddStep2.vue
 create mode 100644 packageIntegral/productUpdate/index.vue

diff --git a/api/packageIntegral/productList.js b/api/packageIntegral/productList.js
index 746fa8a..84df717 100644
--- a/api/packageIntegral/productList.js
+++ b/api/packageIntegral/productList.js
@@ -46,4 +46,24 @@ export default{
 			method: 'get',
 		})
 	},
+	getEdit(id) { // 根据id查询商品数据接口
+		return request({
+			url: `/oil-mall/mallProductInfo/getEdit/${id}`,
+			method: 'get'
+		})
+	},
+	saveProduct(data) { // 新增商品接口
+		return request({
+			url: `/oil-mall/mobile/saveProduct`,
+			method: 'post',
+			data
+		})
+	},
+	updateProduct(data) { // 编辑更新商品数据接口
+		return request({
+			url: `/oil-mall/mobile/updateProduct`,
+			method: 'post',
+			data
+		})
+	},
 }
\ No newline at end of file
diff --git a/packageIntegral/productAddition/index.vue b/packageIntegral/productAddition/index.vue
index 61b3b60..cd0fa06 100644
--- a/packageIntegral/productAddition/index.vue
+++ b/packageIntegral/productAddition/index.vue
@@ -58,7 +58,6 @@
 		
  
     <view id="instruction" :class="currentBoxId == 'instruction' ? 'show' : 'hidden'">
-        <!-- <productAddStep2 /> -->
 		<uni-forms :modelValue="productDate" label-width="200rpx">
 					<uni-forms-item label="属性类别:" >
 						  <uni-data-select
@@ -85,8 +84,8 @@
 				</view>
 				<view>
 					<view>批量填充：<text style="color: #999999;">批量填充填入信息后，可以批量将内容填写到SKU 信息里</text></view>
-					<view class="tagButton" v-for="item in bottonList">{{item.label}}</view>
-					<view class="redButton">确定</view>
+					<view class="tagButton" :class="item.checked == true?'checkedTag':''" @tap="changeChecked(item)" v-for="item in bottonList">{{item.label}}</view>
+					<view class="redButton" @tap="addStockList">确定</view>
 				</view>
 				<view v-if="productDate.attributesTypeId&&checkboxAttributes.length>0" v-for="(items,index) in checkboxAttributes">
 					<view>
@@ -94,7 +93,9 @@
 						<text>规格：</text>
 						<text>{{radioAttributes}}+{{items}}</text>
 					</view>
-					<view class="tagButton" v-for="items in bottonList">{{item.label}}</view>
+					<view class="tagButton" v-if="item.checked==true" v-for="item in stockList">
+						<input type="text" v-model="item.value" :placeholder="item.label" />
+					</view>
 					<view style="display: inline-block;" @click="deleteCheckAll(index)">删除</view>
 				</view>
 				<view v-if="productDate.attributesTypeId&&radioAttributes" >
@@ -103,29 +104,38 @@
 						<text>规格：</text>
 						<text>{{radioAttributes}}</text>
 					</view>
-					<view class="tagButton" v-for="item in bottonList">{{item.label}}</view>
+					<view class="tagButton" v-if="item.checked==true" v-for="item in bottonList">
+						<input type="text" v-model="item.value" :placeholder="item.label" />
+					</view>
 					<view style="display: inline-block;" @click="deleteRadio">删除</view>
 				</view>
 				<view>
 					<view>
 						<text style="color: red;">*</text>
 						商品图片：<text style="color: #999999;">最多可上传10张图片</text></view>
-						<view>
-							<view class="imageBlack">商品主图</view>
-							<view class="imageBlack">设为主图</view>
-							<view class="imageBlack" @tap="srcFileImage">
-								<view style="cameraImage">
-									<uni-icons type="camera-filled" size="30"></uni-icons>
-								</view>
-								
+							<view class="imageList" v-for="(items,index) in productDate.images">
+							<view class="imageBlack" v-if="items.mainMark==1">
+								<image :src="items.url"></image>
+								<view class="cameraText">商品主图</view>
+								<uni-icons class="cameraClear" type="clear" size="20" @tap="clearImage(index)"></uni-icons>
+							</view>
+							<view class="imageBlack" v-else-if="items.mainMark!=1">
+								<image :src="items.url"></image>
+								<view class="cameraText">设为主图</view>
+								<uni-icons class="cameraClear" type="clear" size="20" @tap="clearImage(index)"></uni-icons>
+							</view>
+						</view>
+						<view class="imageBlack" @tap="takePhoto">
+							<view style="cameraImage">
+								<uni-icons type="camera-filled" size="30"></uni-icons>
 							</view>
 						</view>
 					
 				</view>
-				<view>
+				<!-- <view>
 					<view>详情图片：<text style="color: #999999;">最多可上传10张图片</text></view>
 					<view></view>
-				</view>
+				</view> -->
 				</uni-forms>
 		<view class="buttons">
 			<view id="previous"  @click="changeBox">上一步</view>
@@ -143,17 +153,17 @@
 	import utils from '@/utils/encode'
 	import serve from '@/api/packageIntegral/productList.js'
 	import mulpicker from '@/packageIntegral/components/mulpicker.vue'
-	import productAddStep2 from '@/packageIntegral/productAddition/productAddStep2.vue'
 	export default {
 	components: {
-		mulpicker,
-		productAddStep2
+		mulpicker
 	},
 		data() {
 			return {
 				currentBoxId: 'instruction', //当前显示的view的id
 				isBoxShow: false,
-				productDate:{},
+				productDate:{
+					images:[]
+				},
 				productList:[],
 				brandIdList:[],
 				radioItem:[{
@@ -172,13 +182,14 @@
 					 attributesTypeList:[],
 					 attributesList:[],
 					 bottonList:[
-					 	{label:'市场价格',value:'marketPrice'},
-					 	{label:'销售价格',value:'sellPrice'},
-					 	{label:'商品库存',value:'stock'},
-					 	{label:'兑换积分',value:'integral'}
+					 	{label:'市场价格',value:'marketPrice',checked:false},
+					 	{label:'销售价格',value:'sellPrice',checked:false},
+					 	{label:'商品库存',value:'stock',checked:false},
+					 	{label:'兑换积分',value:'integral',checked:false}
 					 ],
 					 radioAttributes:'',
-					 checkboxAttributes:[]
+					 checkboxAttributes:[],
+					 stockList:[]
 			}
 		},
 
@@ -296,6 +307,30 @@
 			  },
 			  deleteRadio(){
 				  this.radioAttributes = ''
+			  },
+			  changeChecked(item){
+				  
+				  item.checked = !item.checked
+				  console.log(this.radioAttributes,this.checkboxAttributes)
+				  
+			  },
+			  addStockList(){
+				  this.stockList = []
+				  let obj = {}
+				  this.bottonList.forEach(tab=>{
+				  					  if(tab.checked == true){
+				  						  if(tab.value == 'marketPrice'){
+				  							  obj.marketPrice = ''
+				  						  }else if(tab.value == 'sellPrice'){
+				  							  obj.sellPrice = ''
+				  						  }else if(tab.value == 'stock'){
+				  							  obj.stock = ''
+				  						  }else if(tab.value == 'integral'){
+				  							  obj.integral = ''
+				  						  }
+				  					  }
+				  })
+				  this.stockList.push(obj)
 			  },
 			   // 调用系统相机
 			      takePhoto() {
@@ -319,13 +354,13 @@
 			                    success: (modalRes) => {
 			                      if (modalRes.confirm) {
 			                        // 引导用户去设置中打开权限
-			                        wx.openSetting({
+			                        uni.openSetting({
 			                        	success(res) {
 			                        		if (res.authSetting['scope.camera']) {
 			                        			re()
-			                        			// 授权成功，重新定位
+			                        			// 授权成功
 			                        		} else {
-			                        			// 没有允许定位权限
+			                        			// 没有允许相机权限
 			                        			wx.showToast({
 			                        				title: '您拒绝了相机权限，将无法使用相机功能',
 			                        				icon: 'none'
@@ -356,6 +391,7 @@
 			  //调起上传图片
 			  srcFileImage() {
 			  	let _that = this
+				let imageUrl = ''
 			  	uni.chooseImage({
 			  		count: 10, //默认9
 			  		sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
@@ -386,8 +422,8 @@
 			  					console.log('进入2')
 			  					console.log(e)
 			  					let obj = JSON.parse(e.data),
-			  						url = obj.data.publicUrl
-									console.log(obj.data.publicUrl)
+			  						imageUrl = obj.data.publicUrl
+									_that.getImage(imageUrl)
 			  				},
 							fail(err) {
 								console.log(err)
@@ -398,6 +434,27 @@
 			  		}
 			  	})
 			  },
+			  getImage(imageUrl){
+				  if(JSON.stringify(this.productDate.images) == '[]'){
+				  	this.productDate.images.push({
+				  		url:imageUrl,
+				  		mainMark:1
+				  	})
+				  }else{
+				  	this.productDate.images.push({
+				  		url:imageUrl,
+				  		mainMark:''
+				  	})
+				  }
+			  },
+			  clearImage(index){
+				if(this.productDate.images[index].mainMark == 1){
+					this.productDate.images.splice(index,1)
+					this.productDate.images[0].mainMark = 1
+				}else{
+					this.productDate.images.splice(index,1)
+				}
+			  },
 			  picker2(e){
 				  console.log(e.detail.value)
 				  this.productDate.value = e.detail.value
@@ -500,6 +557,10 @@
 				text-align: center;
 				margin: 8rpx;
 			}
+			.checkedTag{
+				background-color: #2979ff;
+				color: #FFFFFF;
+			}
 			.redButton{
 				display: inline-block;
 				width: 84rpx;
@@ -510,16 +571,41 @@
 				line-height: 58rpx;
 				text-align: center;
 			}
+			.commodityImage{
+				display: inline-block;
+				max-width: calc(100%-150rpx);
+			}
+			.imageList{
+				display: inline-block;
+				width: 140rpx;
+				margin: 0 10rpx;
+			}
 			.imageBlack{
 				display: inline-block;
 				width: 140rpx;
 				height: 140rpx;
-				line-height: 140rpx;
-				// position: relative;
-				.cameraImage{
-					// position: absolute;
-					// left: 70rpx;
-					// top: 70rpx;
+				position: relative;
+				>image{
+					width: 100%;
+					height: 100%;
+				}
+				.cameraText{
+					width: 140rpx;
+					height: 30rpx;
+					text-align: center;
+					line-height: 30rpx;
+					position: absolute;
+					background-color: #333;
+					opacity: 0.3;
+					color: #FFFFFF;
+					left: 0rpx;
+					top: 110rpx;
+				}
+				.cameraClear{
+					position: absolute;
+					left: 120rpx;
+					top: -10rpx;
+					z-index: 20;
 				}
 			}
 			
diff --git a/packageIntegral/productAddition/productAddStep2.vue b/packageIntegral/productAddition/productAddStep2.vue
deleted file mode 100644
index bd45224..0000000
--- a/packageIntegral/productAddition/productAddStep2.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-	<view class="container">
-		
-		<view class="body">
-			<view class="bodyContent">
-							<uni-collapse ref="collapse">
-								<uni-collapse-item title="属性类型:" style="width: 700rpx;">
-									<view class="content">
-										<view>商品类型：</view>
-										<view>
-											<uni-section type="line">
-														<view class="uni-px-5">
-															<view style="display: inline-block;">尺码：</view>
-															<uni-data-checkbox mode="tag" v-model="radio" :localdata="range"></uni-data-checkbox>
-														</view>
-														<view class="uni-px-5 uni-pb-5">
-															<view style="display: inline-block;">颜色：</view>
-															<uni-data-checkbox mode="tag" multiple v-model="checkbox" :localdata="hobby"></uni-data-checkbox>
-														</view>
-													</uni-section>
-										</view>
-									</view>
-								</uni-collapse-item>
-							</uni-collapse>
-			</view>
-			<view>
-				<view>批量填充：<text style="color: #999999;">批量填充填入信息后，可以批量将内容填写到SKU 信息里</text></view>
-				<view class="tagButton" v-for="item in bottonList">{{item.label}}</view>
-				<view class="redButton">确定</view>
-			</view>
-			<view>
-				<view>
-					<text style="color: red;">*</text>
-					<text>规格</text>
-					<text>M+红色</text>
-				</view>
-				<view class="tagButton" v-for="item in bottonList">{{item.label}}</view>
-				<view style="display: inline-block;">删除</view>
-			</view>
-			<view>
-				<text style="color: red;">*</text>
-				<text>商品图片</text>
-				<text>最多可上传10张图片</text>
-				<view></view>
-			</view>
-			<view>
-				<text>详情图片</text>
-				<text>最多可上传10张图片</text>
-				<view></view>
-			</view>
-		</view>
-		
-		</view>
-</template>
-
-<script>
-	export default{
-		data(){
-			return{
-				radio: 0,
-		        range: [
-		          {
-					text: 'M',
-					value: 0
-				}, {
-					text: 'X',
-					value: 1
-				}, {
-					text: 'XL',
-					value: 2
-				}, {
-					text: '2XL',
-					value: 3
-				},
-		        ],
-				checkbox:[0],
-				hobby: [{
-					text: '黑色',
-					value: 0
-				}, {
-					text: '红色',
-					value: 1
-				}, {
-					text: '白色',
-					value: 2
-				}, {
-					text: '蓝色',
-					value: 3
-				}],
-				bottonList:[
-					{label:'市场价格'},
-					{label:'销售价格'},
-					{label:'商品库存'},
-					{label:'兑换积分'}
-				]
-			}
-		},
-		methods:{
-			
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.container{
-		.body{
-			padding: 30rpx;
-			width: 100%;
-		}
-	}
-	.bodyContent{
-		width: 100%;
-		
-	}
-	.tagButton{
-		display: inline-block;
-		width: 133rpx;
-		height: 58rpx;
-		background: #f5f5f5;
-		color: #666666;
-		border-radius: 10rpx;
-		line-height: 58rpx;
-		text-align: center;
-		margin: 10rpx;
-	}
-	.redButton{
-		display: inline-block;
-		width: 84rpx;
-		height: 58rpx;
-		background: red;
-		color: #fff;
-		border-radius: 10rpx;
-		line-height: 58rpx;
-		text-align: center;
-	}
-	
-</style>
\ No newline at end of file
diff --git a/packageIntegral/productList/index.vue b/packageIntegral/productList/index.vue
index b02a0a1..8ee4a14 100644
--- a/packageIntegral/productList/index.vue
+++ b/packageIntegral/productList/index.vue
@@ -32,7 +32,7 @@
 				 :style="{background:statusEnum[item.auditStatus].color}" >{{statusEnum[item.auditStatus].value}}</view>
 				<view class="footer">
 					<view class="button" @click="orderDelete">删除</view>
-					<view class="button">编辑</view>
+					<view class="button" @click="editOrder(item)">编辑</view>
 					<view class="button" @click="upDownFrame(item)">{{item.productStatus =='1'?'上架':'下架'}}</view>
 				</view>
 			</view>
@@ -194,7 +194,7 @@
 			},
 			toDetails(item) {
 				uni.navigateTo({
-					url: `../orderDetails/index?orderId=${item.orderId}`
+					url: `../orderDetails/index?orderId=${item.id}`
 				})
 			},
 			getTopInfo(){
@@ -242,6 +242,13 @@
 			orderDelete(){
 				this.$refs.delete.open('center')
 			},
+			editOrder(item){
+				console.log(item)
+				uni.navigateTo({
+					url: `../productUpdate/index??orderId=${item.id}`
+				})
+				
+			},
 			upDownFrame(item) {
 				this.productData = item
 				this.$refs.popup.open('center')
diff --git a/packageIntegral/productUpdate/index.vue b/packageIntegral/productUpdate/index.vue
new file mode 100644
index 0000000..cd0fa06
--- /dev/null
+++ b/packageIntegral/productUpdate/index.vue
@@ -0,0 +1,684 @@
+<template>
+	<view class="container">
+		<cu-custom class="main-totextbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
+			<block slot="backText">返回</block>
+			<block slot="content">新增商品</block>
+		</cu-custom>
+    <view id="chooseType" :class="currentBoxId == 'chooseType' ? 'show' : 'hidden'">
+		<uni-forms ref="productForm" :modelValue="productDate" :rules="rules" label-width="200rpx">
+					<uni-forms-item label="商品分类:" name="name">
+						<mulpicker
+						        v-model="productDate.demandRegion"
+						        :list="productList" 
+						    rangekey="categoryName"
+						    code="id"
+						    pidkey="id" 
+						    childkey="classificationTwoList" 
+						    :emitPath="true"
+						    :level="2"
+						    :placeholder="'选择商品分类'"
+						/>
+						<uni-icons color="#666666" type="right" size="22" style="position: absolute;right: 0;top: 10rpx;"></uni-icons>
+					</uni-forms-item>
+					<uni-forms-item label="商品名称:" name="productName">
+						<input type="text" v-model="productDate.productName" placeholder="请输入商品名称" />
+					</uni-forms-item>
+					<uni-forms-item label="关键词:" name="keyword">
+						<input type="text" v-model="productDate.keyword" placeholder="请输入关键词(空格分隔)" />
+					</uni-forms-item>
+					<uni-forms-item label="商品品牌:" name="brandId">
+						<!-- <input type="text" v-model="productDate.brandId" placeholder="请输入商品品牌" /> -->
+						  <uni-data-select
+						        v-model="productDate.brandId"
+						        :localdata="brandIdList"
+								placeholder="请选择商品品牌"
+						      ></uni-data-select>
+					</uni-forms-item>
+					<uni-forms-item label="商品售价:" name="price">
+						<input type="text" v-model="productDate.price" placeholder="请输入商品售价" />
+					</uni-forms-item>
+					<uni-forms-item label="商品上架:" name="productStatus">
+						<switch v-model="productDate.productStatus" color="#FE0606" checked style="transform:scale(0.7)" />
+					</uni-forms-item>
+					<uni-forms-item label="商品推荐:" name="age">
+						<view class='checkbox-con'>
+						 <radio-group>
+						  <label :class="item.checked?'checkbox checked':'checkbox'" @click="checkbox(index)" v-for="(item, index) in radioItem" :key="item.value">
+						  <checkbox :value="item.value" :checked="item.checked"/>{{item.name}}
+						  </label>
+						 </radio-group>
+						 </view>
+					</uni-forms-item>
+				</uni-forms>
+			<view class="buttons">
+				<view @click="closed">取消</view>
+			<view id="next" @click="changeBox">下一步</view>
+			</view>
+		</view>
+		
+ 
+    <view id="instruction" :class="currentBoxId == 'instruction' ? 'show' : 'hidden'">
+		<uni-forms :modelValue="productDate" label-width="200rpx">
+					<uni-forms-item label="属性类别:" >
+						  <uni-data-select
+						        v-model="productDate.attributesTypeId"
+						        :localdata="attributesTypeList"
+								placeholder="请选择商品品牌"
+								@change="attributesData"
+						      ></uni-data-select>
+					</uni-forms-item>
+				<view class="content" v-show="productDate.attributesTypeId">
+					<view>商品类型：</view>
+					<view>
+						<uni-section type="line">
+									<view class="uni-px-5" v-for="(item,index) in attributesList">
+										<view style="display: inline-block;">{{item.attributeName}}：</view>
+										<view  style="display: inline-block;">
+											<uni-data-checkbox v-if="index==0" mode="tag" v-model="radioAttributes" :localdata="item.attributesList"></uni-data-checkbox>
+										<uni-data-checkbox v-else-if="index!=0" mode="tag" multiple v-model="checkboxAttributes" :localdata="hobby"></uni-data-checkbox>
+										</view>
+										
+									</view>
+								</uni-section>
+					</view>
+				</view>
+				<view>
+					<view>批量填充：<text style="color: #999999;">批量填充填入信息后，可以批量将内容填写到SKU 信息里</text></view>
+					<view class="tagButton" :class="item.checked == true?'checkedTag':''" @tap="changeChecked(item)" v-for="item in bottonList">{{item.label}}</view>
+					<view class="redButton" @tap="addStockList">确定</view>
+				</view>
+				<view v-if="productDate.attributesTypeId&&checkboxAttributes.length>0" v-for="(items,index) in checkboxAttributes">
+					<view>
+						<text style="color: red;">*</text>
+						<text>规格：</text>
+						<text>{{radioAttributes}}+{{items}}</text>
+					</view>
+					<view class="tagButton" v-if="item.checked==true" v-for="item in stockList">
+						<input type="text" v-model="item.value" :placeholder="item.label" />
+					</view>
+					<view style="display: inline-block;" @click="deleteCheckAll(index)">删除</view>
+				</view>
+				<view v-if="productDate.attributesTypeId&&radioAttributes" >
+					<view>
+						<text style="color: red;">*</text>
+						<text>规格：</text>
+						<text>{{radioAttributes}}</text>
+					</view>
+					<view class="tagButton" v-if="item.checked==true" v-for="item in bottonList">
+						<input type="text" v-model="item.value" :placeholder="item.label" />
+					</view>
+					<view style="display: inline-block;" @click="deleteRadio">删除</view>
+				</view>
+				<view>
+					<view>
+						<text style="color: red;">*</text>
+						商品图片：<text style="color: #999999;">最多可上传10张图片</text></view>
+							<view class="imageList" v-for="(items,index) in productDate.images">
+							<view class="imageBlack" v-if="items.mainMark==1">
+								<image :src="items.url"></image>
+								<view class="cameraText">商品主图</view>
+								<uni-icons class="cameraClear" type="clear" size="20" @tap="clearImage(index)"></uni-icons>
+							</view>
+							<view class="imageBlack" v-else-if="items.mainMark!=1">
+								<image :src="items.url"></image>
+								<view class="cameraText">设为主图</view>
+								<uni-icons class="cameraClear" type="clear" size="20" @tap="clearImage(index)"></uni-icons>
+							</view>
+						</view>
+						<view class="imageBlack" @tap="takePhoto">
+							<view style="cameraImage">
+								<uni-icons type="camera-filled" size="30"></uni-icons>
+							</view>
+						</view>
+					
+				</view>
+				<!-- <view>
+					<view>详情图片：<text style="color: #999999;">最多可上传10张图片</text></view>
+					<view></view>
+				</view> -->
+				</uni-forms>
+		<view class="buttons">
+			<view id="previous"  @click="changeBox">上一步</view>
+			<view @click="addCompleted">完成</view>
+		</view>
+    </view>
+ 
+
+
+
+	</view>
+</template>
+
+<script>
+	import utils from '@/utils/encode'
+	import serve from '@/api/packageIntegral/productList.js'
+	import mulpicker from '@/packageIntegral/components/mulpicker.vue'
+	export default {
+	components: {
+		mulpicker
+	},
+		data() {
+			return {
+				currentBoxId: 'instruction', //当前显示的view的id
+				isBoxShow: false,
+				productDate:{
+					images:[]
+				},
+				productList:[],
+				brandIdList:[],
+				radioItem:[{
+					  name: '新品',
+					  checked: true
+					 }, {
+					  name: '推荐',
+					  checked: false
+					 }],
+					 rules:{
+						 name:{rules:[{required: true,errorMessage: '请选择商品分类'}]},
+						 productName:{rules:[{required: true,errorMessage: '请输入商品名称'}]},
+						 brandId:{rules:[{required: true,errorMessage: '请输入商品品牌'}]},
+						 price:{rules:[{required: true,errorMessage: '请输入商品售价'}]},
+					 },
+					 attributesTypeList:[],
+					 attributesList:[],
+					 bottonList:[
+					 	{label:'市场价格',value:'marketPrice',checked:false},
+					 	{label:'销售价格',value:'sellPrice',checked:false},
+					 	{label:'商品库存',value:'stock',checked:false},
+					 	{label:'兑换积分',value:'integral',checked:false}
+					 ],
+					 radioAttributes:'',
+					 checkboxAttributes:[],
+					 stockList:[]
+			}
+		},
+
+		onLoad(options) {
+			// this.get(options.orderId)
+			this.classfication()
+			this.getProductBrands()
+			this.getAttributesType()
+		},
+		watch:{
+			'productDate.demandRegion'(val){
+				if(val){
+					this.productDate.categoryOneId = val.split(',')[0]
+					this.productDate.categoryTwoId = val.split(',')[1]
+				}
+			}
+		},
+		methods: {
+			classfication(){
+				serve.classification().then(res=>{
+					this.productList = res.data
+				})
+			},
+			getProductBrands(){
+				this.brandIdList = []
+				serve.getProductBrands().then(res=>{
+					console.log(res)
+					res.data.forEach(tab=>{
+						this.brandIdList.push({value:tab.id,text:tab.brandName})
+					})
+					
+				})
+			},
+			checkbox (e) {
+				 var index = e;//获取当前点击的下标
+				 var checkboxArr = this.radioItem;//选项集合
+				 // if (checkboxArr[index].checked) return;//如果点击的当前已选中则返回
+				 // checkboxArr.forEach(item => {
+				 //  item.checked = false
+				 // })
+				 if(checkboxArr[index].checked ==false){
+					 checkboxArr[index].checked = true; //改变当前选中的checked值
+
+				 }else {
+					 checkboxArr[index].checked = false; //改变当前选中的checked值
+				 }
+				 if(checkboxArr[0].checked ==true){
+					 this.productDate.newMark = 1
+				 }else{
+					 this.productDate.newMark = 2
+				 }
+				 if(checkboxArr[1].checked ==true){
+					 this.productDate.recommend = 1
+				 }else{
+					 this.productDate.recommend = 2
+				 }
+		
+			 },
+			  changeBox(e){
+			    let currentFlag = e.currentTarget.id;
+			    switch(currentFlag){
+			      case 'next':
+			          this.currentBoxId = 'instruction'
+			        break;
+			      case 'previous':
+			          this.currentBoxId = 'chooseType'
+			        break;
+			        default:
+			            this.currentBoxId = 'viewInstruction'
+			          break;
+			    }
+				if(currentFlag == 'next'){
+					this.getAttributesType()
+				}
+			  },
+			  getAttributesType(){
+				  this.attributesTypeList = []
+				serve.getAttributesType().then(res=>{
+					res.data.forEach(tab=>{
+						this.attributesTypeList.push({
+							value:tab.id,
+							text:tab.name,
+							number:tab.number,
+							attributesList:tab.attributesList
+							})
+					})
+				})  
+			  },
+			  attributesData(){
+				  if(this.productDate.attributesTypeId){
+					this.attributesTypeList.forEach(tab=>{
+					  if(tab.id = this.productDate.attributesTypeId){
+						  this.attributesList = tab.attributesList
+						  this.attributesList.forEach(tab=>{
+							  tab.attributesList = []
+							  tab.attributeContent.split(',').forEach(item=>{
+								  tab.attributesList.push({value:item,text:item})
+							  })
+						  })
+						  
+					  }
+				  })  
+				  }else{
+					  this.attributesList = []
+				  }
+				  
+			  },
+			  deleteCheckAll(i){
+				  if(this.checkboxAttributes.length>1){
+					  this.checkboxAttributes.splice(i,1)
+				  }else{
+					  this.checkboxAttributes.splice(i,1)
+					  this.radioAttributes = ''
+				  }
+			  },
+			  deleteRadio(){
+				  this.radioAttributes = ''
+			  },
+			  changeChecked(item){
+				  
+				  item.checked = !item.checked
+				  console.log(this.radioAttributes,this.checkboxAttributes)
+				  
+			  },
+			  addStockList(){
+				  this.stockList = []
+				  let obj = {}
+				  this.bottonList.forEach(tab=>{
+				  					  if(tab.checked == true){
+				  						  if(tab.value == 'marketPrice'){
+				  							  obj.marketPrice = ''
+				  						  }else if(tab.value == 'sellPrice'){
+				  							  obj.sellPrice = ''
+				  						  }else if(tab.value == 'stock'){
+				  							  obj.stock = ''
+				  						  }else if(tab.value == 'integral'){
+				  							  obj.integral = ''
+				  						  }
+				  					  }
+				  })
+				  this.stockList.push(obj)
+			  },
+			   // 调用系统相机
+			      takePhoto() {
+			        // 先检查权限
+					let _that = this
+			        uni.getSetting({
+			          success(res) {
+			            if (!res.authSetting['scope.camera']) {
+			              // 请求权限
+			              uni.authorize({
+			                scope: 'scope.camera',
+			                success() {
+			                  // 权限已经获取，可以调用相机
+			                  _that.srcFileImage()
+			                },
+			                fail() {
+			                  // 用户拒绝授权，需引导用户开启权限
+			                  uni.showModal({
+			                    title: '提示',
+			                    content: '需要相机权限才能使用相机功能，请在设置中打开',
+			                    success: (modalRes) => {
+			                      if (modalRes.confirm) {
+			                        // 引导用户去设置中打开权限
+			                        uni.openSetting({
+			                        	success(res) {
+			                        		if (res.authSetting['scope.camera']) {
+			                        			re()
+			                        			// 授权成功
+			                        		} else {
+			                        			// 没有允许相机权限
+			                        			wx.showToast({
+			                        				title: '您拒绝了相机权限，将无法使用相机功能',
+			                        				icon: 'none'
+			                        			});
+			                        			rj('拒绝了相机权限')
+			                        		}
+			                        	},
+			                        	fail() {
+			                        		rj('openSetting调用失败')
+			                        	}
+			                        })
+			                      }
+			                    },
+			                  });
+			                },
+			              });
+			            } else {
+			              // 权限已经获取，可以直接调用相机
+			              _that.srcFileImage()
+			            }
+			          },
+			          fail(err) {
+			            // 获取设置失败
+			            console.error(err);
+			          },
+			        });
+			      },
+			  //调起上传图片
+			  srcFileImage() {
+			  	let _that = this
+				let imageUrl = ''
+			  	uni.chooseImage({
+			  		count: 10, //默认9
+			  		sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+			  		sourceType: ['album'], //从相册选择
+			  		success: function(res) {
+			  			console.log(res)
+			  			console.log('进入1')
+			  			const JSESSIONID = utils.uuid()
+			  			uni.uploadFile({
+			  				url: 'http://uat.xingoil.com/adminapi/oil-oss/obejct/uploadFile',
+			  				filePath: res.tempFilePaths[0],
+			  				formData: {
+			  					ossKey: 'xingyou',
+			  					pathKey: 'publicxingyou',
+			  					encrypt: 'PUBLIC',
+			  				},
+			  				name: 'file',
+			  				header: {
+			  					"Content-Type": "multipart/form-data",
+			  					"Authorization": uni.getStorageSync('Authorization'),
+			  					'dataSources': 'MP',
+			  					"imei": uni.getStorageSync('unionid'),
+			  					"openId": uni.getStorageSync('openid'),
+			  					'JSESSIONID': JSESSIONID,
+			  					'token': utils.md5Salt(JSESSIONID)
+			  				},
+			  				success(e) {
+			  					console.log('进入2')
+			  					console.log(e)
+			  					let obj = JSON.parse(e.data),
+			  						imageUrl = obj.data.publicUrl
+									_that.getImage(imageUrl)
+			  				},
+							fail(err) {
+								console.log(err)
+							}
+			  			})
+			  		},fail() {
+			  			console.log('相机调用失败')
+			  		}
+			  	})
+			  },
+			  getImage(imageUrl){
+				  if(JSON.stringify(this.productDate.images) == '[]'){
+				  	this.productDate.images.push({
+				  		url:imageUrl,
+				  		mainMark:1
+				  	})
+				  }else{
+				  	this.productDate.images.push({
+				  		url:imageUrl,
+				  		mainMark:''
+				  	})
+				  }
+			  },
+			  clearImage(index){
+				if(this.productDate.images[index].mainMark == 1){
+					this.productDate.images.splice(index,1)
+					this.productDate.images[0].mainMark = 1
+				}else{
+					this.productDate.images.splice(index,1)
+				}
+			  },
+			  picker2(e){
+				  console.log(e.detail.value)
+				  this.productDate.value = e.detail.value
+			  },
+			  closed(){
+				  uni.navigateTo({
+				  	url: '/pages/index/index'
+				  })
+			  },
+			  addCompleted(){
+				  
+			  }
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+		.fadeBox{
+		    width: 100%;
+		    margin-bottom: 20rpx;
+		}
+		#chooseType{
+		padding: 30rpx;
+		
+		mulpicker{
+			height: 72rpx;
+			line-height: 72rpx;
+		}
+		/deep/ .uni-forms{
+			width: 100%;
+		}
+		.content{
+			font-size: 28rpx;
+			font-weight: bold;
+		}
+		
+		
+		/deep/ .uni-forms-item{
+			width: 100%;
+		}
+		
+		/deep/ .uni-forms-item__label{
+			color: #333 !important;
+			font-size: 30rpx;
+			font-weight: 700;
+		}
+		/deep/ .uni-forms-item__content{
+			width: 100%;
+			input{
+				height: 72rpx;
+				line-height: 72rpx;
+			}
+		}
+		
+		switch{
+			margin-top: 9rpx;
+		}
+		switch::before{
+			 content: '';
+		 }
+		 switch::after{
+			 content: '';
+		 }	
+		}
+		#instruction{
+			padding: 30rpx;
+			
+			mulpicker{
+				height: 72rpx;
+				line-height: 72rpx;
+			}
+			/deep/ .uni-forms{
+				width: 100%;
+			}
+			/deep/ .uni-forms-item{
+				width: 100%;
+			}
+			
+			/deep/ .uni-forms-item__label{
+				color: #333 !important;
+				font-size: 30rpx;
+				font-weight: 700;
+			}
+			/deep/ .uni-forms-item__content{
+				width: 100%;
+				input{
+					height: 72rpx;
+					line-height: 72rpx;
+				}
+			}
+			.tagButton{
+				display: inline-block;
+				width: 133rpx;
+				height: 58rpx;
+				background: #f5f5f5;
+				color: #666666;
+				border-radius: 8rpx;
+				line-height: 58rpx;
+				text-align: center;
+				margin: 8rpx;
+			}
+			.checkedTag{
+				background-color: #2979ff;
+				color: #FFFFFF;
+			}
+			.redButton{
+				display: inline-block;
+				width: 84rpx;
+				height: 58rpx;
+				background: red;
+				color: #fff;
+				border-radius: 10rpx;
+				line-height: 58rpx;
+				text-align: center;
+			}
+			.commodityImage{
+				display: inline-block;
+				max-width: calc(100%-150rpx);
+			}
+			.imageList{
+				display: inline-block;
+				width: 140rpx;
+				margin: 0 10rpx;
+			}
+			.imageBlack{
+				display: inline-block;
+				width: 140rpx;
+				height: 140rpx;
+				position: relative;
+				>image{
+					width: 100%;
+					height: 100%;
+				}
+				.cameraText{
+					width: 140rpx;
+					height: 30rpx;
+					text-align: center;
+					line-height: 30rpx;
+					position: absolute;
+					background-color: #333;
+					opacity: 0.3;
+					color: #FFFFFF;
+					left: 0rpx;
+					top: 110rpx;
+				}
+				.cameraClear{
+					position: absolute;
+					left: 120rpx;
+					top: -10rpx;
+					z-index: 20;
+				}
+			}
+			
+		}
+		
+		.checkbox-con{
+		 margin-top: 40rpx;
+		 text-align: center;
+		 position: relative;
+		}
+		.checkbox{
+		 width: 180rpx;
+		 height: 76rpx;
+		 line-height: 76rpx;
+		 font-size: 30rpx;
+		 color: #666666;
+		 border: 1rpx solid #B6B6B6;
+		 border-radius: 5rpx;
+		 display: inline-block;
+		 margin: 0 10rpx 20rpx 0;
+		 position: absolute;
+		 top: 50rpx;
+		 &:nth-of-type(1){
+			 left: -190rpx;
+		 }
+		 &:nth-of-type(2){
+			 left: 50rpx;
+		 }
+		}
+		
+		.checked{
+		 color: #FFFFFF;
+		 background: #FE0606;
+		 border: 1rpx solid #FE0606;
+		}
+		.checkbox checkbox{
+		 display: none
+		}
+		 
+		 
+		 
+		 
+		.buttons {
+			width: 100%;
+			display: flex;
+			justify-content: space-evenly;
+			margin-top: 180rpx;
+		
+			>view {
+				width: 250rpx;
+				height: 76rpx;
+				text-align: center;
+				line-height: 76rpx;
+				border-radius: 10rpx;
+				font-size: 28rpx;
+		
+				&:nth-of-type(1) {
+					background: #FFFFFF;
+					border: 1rpx solid #B6B6B6;
+					color: #333;
+				}
+		
+				&:nth-of-type(2) {
+					background: #FE0505;
+					color: #fff;
+				}
+			}
+		}
+		.show{
+		    display: flex;
+		    flex-wrap: wrap;
+		}
+		.hidden{
+		    display: none;
+		}
+</style>
-- 
2.49.1


From 53aa029391efcdda20c390b3e50a30f32c7e6240 Mon Sep 17 00:00:00 2001
From: zhangyouji <zhangyouji@sdxkhlw.cn>
Date: Fri, 29 Mar 2024 17:11:02 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageIntegral/productAddition/index.vue | 193 ++++++++----------
 packageIntegral/productList/index.vue     |   7 +-
 packageIntegral/productUpdate/index.vue   | 237 ++++++++++++----------
 pages.json                                |   3 +
 4 files changed, 220 insertions(+), 220 deletions(-)

diff --git a/packageIntegral/productAddition/index.vue b/packageIntegral/productAddition/index.vue
index cd0fa06..320c023 100644
--- a/packageIntegral/productAddition/index.vue
+++ b/packageIntegral/productAddition/index.vue
@@ -38,7 +38,7 @@
 						<input type="text" v-model="productDate.price" placeholder="请输入商品售价" />
 					</uni-forms-item>
 					<uni-forms-item label="商品上架:" name="productStatus">
-						<switch v-model="productDate.productStatus" color="#FE0606" checked style="transform:scale(0.7)" />
+						<switch v-model="productDate.productStatus" :checked="productDate.productStatus=='1'" color="#FE0606" @change="switchChange" style="transform:scale(0.7)" />
 					</uni-forms-item>
 					<uni-forms-item label="商品推荐:" name="age">
 						<view class='checkbox-con'>
@@ -68,7 +68,7 @@
 						      ></uni-data-select>
 					</uni-forms-item>
 				<view class="content" v-show="productDate.attributesTypeId">
-					<view>商品类型：</view>
+					<view style="margin: 10rpx 0;">商品类型：</view>
 					<view>
 						<uni-section type="line">
 									<view class="uni-px-5" v-for="(item,index) in attributesList">
@@ -83,36 +83,37 @@
 					</view>
 				</view>
 				<view>
-					<view>批量填充：<text style="color: #999999;">批量填充填入信息后，可以批量将内容填写到SKU 信息里</text></view>
-					<view class="tagButton" :class="item.checked == true?'checkedTag':''" @tap="changeChecked(item)" v-for="item in bottonList">{{item.label}}</view>
+					<view>批量填充：<text style="color: #999999;margin: 10rpx 0;">批量填充填入信息后，可以批量将内容填写到SKU 信息里</text></view>
+					<view class="tagButton" @tap="changeChecked(item)" v-for="item in bottonList">{{item.label}}</view>
 					<view class="redButton" @tap="addStockList">确定</view>
 				</view>
-				<view v-if="productDate.attributesTypeId&&checkboxAttributes.length>0" v-for="(items,index) in checkboxAttributes">
-					<view>
+				<view v-for="(items,index) in stockList">
+					<view style="margin: 10rpx 0;">
 						<text style="color: red;">*</text>
 						<text>规格：</text>
-						<text>{{radioAttributes}}+{{items}}</text>
+						<text v-if="index==0">{{radioAttributes}}</text>
+						<text v-if="index!=0">{{radioAttributes}}+{{checkboxAttributes[index]}}</text>
 					</view>
-					<view class="tagButton" v-if="item.checked==true" v-for="item in stockList">
-						<input type="text" v-model="item.value" :placeholder="item.label" />
+					<view class="tagButton">
+						<input type="text" v-model="items.marketPrice" placeholder="市场价格" />
 					</view>
-					<view style="display: inline-block;" @click="deleteCheckAll(index)">删除</view>
-				</view>
-				<view v-if="productDate.attributesTypeId&&radioAttributes" >
-					<view>
-						<text style="color: red;">*</text>
-						<text>规格：</text>
-						<text>{{radioAttributes}}</text>
+					<view class="tagButton">
+						<input type="text" v-model="items.sellPrice" placeholder="销售价格" />
 					</view>
-					<view class="tagButton" v-if="item.checked==true" v-for="item in bottonList">
-						<input type="text" v-model="item.value" :placeholder="item.label" />
+					<view class="tagButton">
+						<input type="text" v-model="items.stock" placeholder="库存数量" />
 					</view>
-					<view style="display: inline-block;" @click="deleteRadio">删除</view>
+					<view class="tagButton">
+						<input type="text" v-model="items.integral" placeholder="积分价值" />
+					</view>
+					<view style="display: inline-block;vertical-align: top;margin-top: 10rpx;" @click="deleteCheckAll(index)">删除</view>
 				</view>
 				<view>
-					<view>
+					<view style="margin: 10rpx 0;">
 						<text style="color: red;">*</text>
-						商品图片：<text style="color: #999999;">最多可上传10张图片</text></view>
+						商品图片：
+						<text style="color: #999999;">最多可上传10张图片</text>
+						</view>
 							<view class="imageList" v-for="(items,index) in productDate.images">
 							<view class="imageBlack" v-if="items.mainMark==1">
 								<image :src="items.url"></image>
@@ -121,12 +122,12 @@
 							</view>
 							<view class="imageBlack" v-else-if="items.mainMark!=1">
 								<image :src="items.url"></image>
-								<view class="cameraText">设为主图</view>
+								<view class="cameraText" @click="setMainImage(index)">设为主图</view>
 								<uni-icons class="cameraClear" type="clear" size="20" @tap="clearImage(index)"></uni-icons>
 							</view>
 						</view>
-						<view class="imageBlack" @tap="takePhoto">
-							<view style="cameraImage">
+						<view class="imageBlack" style="background-color: #fafafa;" @tap="srcFileImage">
+							<view style="margin-top: 46rpx;">
 								<uni-icons type="camera-filled" size="30"></uni-icons>
 							</view>
 						</view>
@@ -159,7 +160,7 @@
 	},
 		data() {
 			return {
-				currentBoxId: 'instruction', //当前显示的view的id
+				currentBoxId: 'chooseType', //当前显示的view的id
 				isBoxShow: false,
 				productDate:{
 					images:[]
@@ -193,8 +194,7 @@
 			}
 		},
 
-		onLoad(options) {
-			// this.get(options.orderId)
+		onLoad() {
 			this.classfication()
 			this.getProductBrands()
 			this.getAttributesType()
@@ -208,6 +208,13 @@
 			}
 		},
 		methods: {
+			switchChange(e){
+				if(e.detail.value == true){
+					this.productDate.productStatus = '1'
+				}else if(e.detail.value == false){
+					this.productDate.productStatus = '2'
+				}
+			},
 			classfication(){
 				serve.classification().then(res=>{
 					this.productList = res.data
@@ -304,90 +311,43 @@
 					  this.checkboxAttributes.splice(i,1)
 					  this.radioAttributes = ''
 				  }
+				  this.stockList.splice(i,1)
 			  },
 			  deleteRadio(){
 				  this.radioAttributes = ''
 			  },
 			  changeChecked(item){
-				  
 				  item.checked = !item.checked
-				  console.log(this.radioAttributes,this.checkboxAttributes)
-				  
 			  },
 			  addStockList(){
 				  this.stockList = []
-				  let obj = {}
-				  this.bottonList.forEach(tab=>{
-				  					  if(tab.checked == true){
-				  						  if(tab.value == 'marketPrice'){
-				  							  obj.marketPrice = ''
-				  						  }else if(tab.value == 'sellPrice'){
-				  							  obj.sellPrice = ''
-				  						  }else if(tab.value == 'stock'){
-				  							  obj.stock = ''
-				  						  }else if(tab.value == 'integral'){
-				  							  obj.integral = ''
-				  						  }
-				  					  }
-				  })
-				  this.stockList.push(obj)
+				  let obj = {
+				  		marketPrice:'',
+				  		sellPrice:'',
+				  		stock:'',
+				  		integral:''
+				  }
+				  if(this.attributesList.length ==1){
+					  let data = {}
+					  let name = this.attributesList[0].attributeName
+					  let value = this.radioAttributes
+					  data[name] = value
+					  obj.attributeJson = JSON.stringify(data)
+					  this.stockList.push(obj)
+				  }else{
+					  this.checkboxAttributes.forEach((tab,index)=>{
+						  let name = this.attributesList[0].attributeName
+						  let value = this.radioAttributes
+						  let tabName = this.attributesList[index+1].attributeName
+						  let tabValue = tab
+						  data[name] = value
+						  data[tabName] = tabValue
+						  obj.attributeJson = JSON.stringify(data)
+						  this.stockList.push(obj)
+					  })
+					  
+				  }
 			  },
-			   // 调用系统相机
-			      takePhoto() {
-			        // 先检查权限
-					let _that = this
-			        uni.getSetting({
-			          success(res) {
-			            if (!res.authSetting['scope.camera']) {
-			              // 请求权限
-			              uni.authorize({
-			                scope: 'scope.camera',
-			                success() {
-			                  // 权限已经获取，可以调用相机
-			                  _that.srcFileImage()
-			                },
-			                fail() {
-			                  // 用户拒绝授权，需引导用户开启权限
-			                  uni.showModal({
-			                    title: '提示',
-			                    content: '需要相机权限才能使用相机功能，请在设置中打开',
-			                    success: (modalRes) => {
-			                      if (modalRes.confirm) {
-			                        // 引导用户去设置中打开权限
-			                        uni.openSetting({
-			                        	success(res) {
-			                        		if (res.authSetting['scope.camera']) {
-			                        			re()
-			                        			// 授权成功
-			                        		} else {
-			                        			// 没有允许相机权限
-			                        			wx.showToast({
-			                        				title: '您拒绝了相机权限，将无法使用相机功能',
-			                        				icon: 'none'
-			                        			});
-			                        			rj('拒绝了相机权限')
-			                        		}
-			                        	},
-			                        	fail() {
-			                        		rj('openSetting调用失败')
-			                        	}
-			                        })
-			                      }
-			                    },
-			                  });
-			                },
-			              });
-			            } else {
-			              // 权限已经获取，可以直接调用相机
-			              _that.srcFileImage()
-			            }
-			          },
-			          fail(err) {
-			            // 获取设置失败
-			            console.error(err);
-			          },
-			        });
-			      },
 			  //调起上传图片
 			  srcFileImage() {
 			  	let _that = this
@@ -447,6 +407,15 @@
 				  	})
 				  }
 			  },
+			  setMainImage(index){
+				  this.productDate.images.forEach((tab,i)=>{
+					  if(i == index){
+						  tab.mainMark = 1
+					  }else{
+						  tab.mainMark = ''
+					  }
+				  })
+			  },
 			  clearImage(index){
 				if(this.productDate.images[index].mainMark == 1){
 					this.productDate.images.splice(index,1)
@@ -455,17 +424,26 @@
 					this.productDate.images.splice(index,1)
 				}
 			  },
-			  picker2(e){
-				  console.log(e.detail.value)
-				  this.productDate.value = e.detail.value
-			  },
 			  closed(){
 				  uni.navigateTo({
 				  	url: '/pages/index/index'
 				  })
 			  },
 			  addCompleted(){
-				  
+				  if(this.radioItem[0].checked =true){
+					this.productDate.newMark == '1'
+				  }else{
+					  this.productDate.newMark == '2'
+				  }
+				  if(this.radioItem[1].checked =true){
+					  this.productDate.recommend == '1'
+				  }else{
+					  this.productDate.recommend == '2'
+				  }
+				  this.productDate.stockList  =  this.stockList
+				  serve.saveProduct(this.productDate).then(res=>{
+					  console.log(res)
+				  })
 			  }
 		}
 	}
@@ -549,7 +527,6 @@
 			.tagButton{
 				display: inline-block;
 				width: 133rpx;
-				height: 58rpx;
 				background: #f5f5f5;
 				color: #666666;
 				border-radius: 8rpx;
@@ -584,6 +561,8 @@
 				display: inline-block;
 				width: 140rpx;
 				height: 140rpx;
+				vertical-align: middle;
+				text-align: center;
 				position: relative;
 				>image{
 					width: 100%;
diff --git a/packageIntegral/productList/index.vue b/packageIntegral/productList/index.vue
index 8ee4a14..e98ebdb 100644
--- a/packageIntegral/productList/index.vue
+++ b/packageIntegral/productList/index.vue
@@ -32,7 +32,7 @@
 				 :style="{background:statusEnum[item.auditStatus].color}" >{{statusEnum[item.auditStatus].value}}</view>
 				<view class="footer">
 					<view class="button" @click="orderDelete">删除</view>
-					<view class="button" @click="editOrder(item)">编辑</view>
+					<view class="button" @click="toEditOrder(item)">编辑</view>
 					<view class="button" @click="upDownFrame(item)">{{item.productStatus =='1'?'上架':'下架'}}</view>
 				</view>
 			</view>
@@ -242,10 +242,9 @@
 			orderDelete(){
 				this.$refs.delete.open('center')
 			},
-			editOrder(item){
-				console.log(item)
+			toEditOrder(item){
 				uni.navigateTo({
-					url: `../productUpdate/index??orderId=${item.id}`
+					url: `../productUpdate/index?id=${item.id}`
 				})
 				
 			},
diff --git a/packageIntegral/productUpdate/index.vue b/packageIntegral/productUpdate/index.vue
index cd0fa06..5d9665e 100644
--- a/packageIntegral/productUpdate/index.vue
+++ b/packageIntegral/productUpdate/index.vue
@@ -38,7 +38,7 @@
 						<input type="text" v-model="productDate.price" placeholder="请输入商品售价" />
 					</uni-forms-item>
 					<uni-forms-item label="商品上架:" name="productStatus">
-						<switch v-model="productDate.productStatus" color="#FE0606" checked style="transform:scale(0.7)" />
+						<switch v-model="productDate.productStatus" :checked="productDate.productStatus=='1'" color="#FE0606" @change="switchChange" style="transform:scale(0.7)" />
 					</uni-forms-item>
 					<uni-forms-item label="商品推荐:" name="age">
 						<view class='checkbox-con'>
@@ -68,7 +68,7 @@
 						      ></uni-data-select>
 					</uni-forms-item>
 				<view class="content" v-show="productDate.attributesTypeId">
-					<view>商品类型：</view>
+					<view style="margin: 10rpx 0;">商品类型：</view>
 					<view>
 						<uni-section type="line">
 									<view class="uni-px-5" v-for="(item,index) in attributesList">
@@ -83,36 +83,37 @@
 					</view>
 				</view>
 				<view>
-					<view>批量填充：<text style="color: #999999;">批量填充填入信息后，可以批量将内容填写到SKU 信息里</text></view>
-					<view class="tagButton" :class="item.checked == true?'checkedTag':''" @tap="changeChecked(item)" v-for="item in bottonList">{{item.label}}</view>
+					<view>批量填充：<text style="color: #999999;margin: 10rpx 0;">批量填充填入信息后，可以批量将内容填写到SKU 信息里</text></view>
+					<view class="tagButton" @tap="changeChecked(item)" v-for="item in bottonList">{{item.label}}</view>
 					<view class="redButton" @tap="addStockList">确定</view>
 				</view>
-				<view v-if="productDate.attributesTypeId&&checkboxAttributes.length>0" v-for="(items,index) in checkboxAttributes">
-					<view>
+				<view v-for="(items,index) in stockList">
+					<view style="margin: 10rpx 0;">
 						<text style="color: red;">*</text>
 						<text>规格：</text>
-						<text>{{radioAttributes}}+{{items}}</text>
+						<text v-if="index==0">{{radioAttributes}}</text>
+						<text v-if="index!=0">{{radioAttributes}}+{{checkboxAttributes[index]}}</text>
 					</view>
-					<view class="tagButton" v-if="item.checked==true" v-for="item in stockList">
-						<input type="text" v-model="item.value" :placeholder="item.label" />
+					<view class="tagButton">
+						<input type="text" v-model="items.marketPrice" placeholder="市场价格" />
 					</view>
-					<view style="display: inline-block;" @click="deleteCheckAll(index)">删除</view>
-				</view>
-				<view v-if="productDate.attributesTypeId&&radioAttributes" >
-					<view>
-						<text style="color: red;">*</text>
-						<text>规格：</text>
-						<text>{{radioAttributes}}</text>
+					<view class="tagButton">
+						<input type="text" v-model="items.sellPrice" placeholder="销售价格" />
 					</view>
-					<view class="tagButton" v-if="item.checked==true" v-for="item in bottonList">
-						<input type="text" v-model="item.value" :placeholder="item.label" />
+					<view class="tagButton">
+						<input type="text" v-model="items.stock" placeholder="库存数量" />
 					</view>
-					<view style="display: inline-block;" @click="deleteRadio">删除</view>
+					<view class="tagButton">
+						<input type="text" v-model="items.integral" placeholder="积分价值" />
+					</view>
+					<view style="display: inline-block;vertical-align: top;margin-top: 10rpx;" @click="deleteCheckAll(index)">删除</view>
 				</view>
 				<view>
-					<view>
+					<view style="margin: 10rpx 0;">
 						<text style="color: red;">*</text>
-						商品图片：<text style="color: #999999;">最多可上传10张图片</text></view>
+						商品图片：
+						<text style="color: #999999;">最多可上传10张图片</text>
+						</view>
 							<view class="imageList" v-for="(items,index) in productDate.images">
 							<view class="imageBlack" v-if="items.mainMark==1">
 								<image :src="items.url"></image>
@@ -121,12 +122,12 @@
 							</view>
 							<view class="imageBlack" v-else-if="items.mainMark!=1">
 								<image :src="items.url"></image>
-								<view class="cameraText">设为主图</view>
+								<view class="cameraText" @click="setMainImage(index)">设为主图</view>
 								<uni-icons class="cameraClear" type="clear" size="20" @tap="clearImage(index)"></uni-icons>
 							</view>
 						</view>
-						<view class="imageBlack" @tap="takePhoto">
-							<view style="cameraImage">
+						<view class="imageBlack" style="background-color: #fafafa;" @tap="srcFileImage">
+							<view style="margin-top: 46rpx;">
 								<uni-icons type="camera-filled" size="30"></uni-icons>
 							</view>
 						</view>
@@ -159,7 +160,7 @@
 	},
 		data() {
 			return {
-				currentBoxId: 'instruction', //当前显示的view的id
+				currentBoxId: 'chooseType', //当前显示的view的id
 				isBoxShow: false,
 				productDate:{
 					images:[]
@@ -194,7 +195,8 @@
 		},
 
 		onLoad(options) {
-			// this.get(options.orderId)
+			console.log(options,'options')
+			this.getEdit(options)
 			this.classfication()
 			this.getProductBrands()
 			this.getAttributesType()
@@ -208,6 +210,56 @@
 			}
 		},
 		methods: {
+			getEdit(options){
+				serve.getEdit(options.id).then(res=>{
+					if(res.code === 20000&&res.data!=null){
+						this.productDate = res.data
+						this.productDate.demandRegion = res.data.categoryOneId+','+res.data.categoryTwoId
+						if(this.productDate.newMark == '1'){
+							this.radioItem[0].checked =true
+						}else{
+							this.radioItem[0].checked =false
+						}
+						if(this.productDate.recommend == '1'){
+							this.radioItem[1].checked =true
+						}else{
+							this.radioItem[1].checked =false
+						}
+						this.attributesTypeList.forEach(tab=>{
+							if(tab.id = this.productDate.attributesTypeId){
+								this.attributesList = tab.attributesList
+								this.attributesList.forEach(tab=>{
+									tab.attributesList = []
+									tab.attributeContent.split(',').forEach(item=>{
+										tab.attributesList.push({value:item,text:item})
+									})
+								})
+							}
+						})
+						if(this.productDate.checkedList.length==1){
+							this.radioAttributes = this.productDate.checkedList[0].checked
+						}else{
+							this.checkboxAttributes = []
+							this.productDate.checkedList.forEach((tab,index)=>{
+								if(index!=0){
+									this.checkboxAttributes.push(tab.checked)
+								}
+							})
+						}
+						this.stockList = this.productDate.stockList
+						
+						
+					}
+					console.log(res.data)
+				})
+			},
+			switchChange(e){
+				if(e.detail.value == true){
+					this.productDate.productStatus = '1'
+				}else if(e.detail.value == false){
+					this.productDate.productStatus = '2'
+				}
+			},
 			classfication(){
 				serve.classification().then(res=>{
 					this.productList = res.data
@@ -304,90 +356,43 @@
 					  this.checkboxAttributes.splice(i,1)
 					  this.radioAttributes = ''
 				  }
+				  this.stockList.splice(i,1)
 			  },
 			  deleteRadio(){
 				  this.radioAttributes = ''
 			  },
 			  changeChecked(item){
-				  
 				  item.checked = !item.checked
-				  console.log(this.radioAttributes,this.checkboxAttributes)
-				  
 			  },
 			  addStockList(){
 				  this.stockList = []
-				  let obj = {}
-				  this.bottonList.forEach(tab=>{
-				  					  if(tab.checked == true){
-				  						  if(tab.value == 'marketPrice'){
-				  							  obj.marketPrice = ''
-				  						  }else if(tab.value == 'sellPrice'){
-				  							  obj.sellPrice = ''
-				  						  }else if(tab.value == 'stock'){
-				  							  obj.stock = ''
-				  						  }else if(tab.value == 'integral'){
-				  							  obj.integral = ''
-				  						  }
-				  					  }
-				  })
-				  this.stockList.push(obj)
+				  let obj = {
+				  		marketPrice:'',
+				  		sellPrice:'',
+				  		stock:'',
+				  		integral:''
+				  }
+				  if(this.attributesList.length ==1){
+					  let data = {}
+					  let name = this.attributesList[0].attributeName
+					  let value = this.radioAttributes
+					  data[name] = value
+					  obj.attributeJson = JSON.stringify(data)
+					  this.stockList.push(obj)
+				  }else{
+					  this.checkboxAttributes.forEach((tab,index)=>{
+						  let name = this.attributesList[0].attributeName
+						  let value = this.radioAttributes
+						  let tabName = this.attributesList[index+1].attributeName
+						  let tabValue = tab
+						  data[name] = value
+						  data[tabName] = tabValue
+						  obj.attributeJson = JSON.stringify(data)
+						  this.stockList.push(obj)
+					  })
+					  
+				  }
 			  },
-			   // 调用系统相机
-			      takePhoto() {
-			        // 先检查权限
-					let _that = this
-			        uni.getSetting({
-			          success(res) {
-			            if (!res.authSetting['scope.camera']) {
-			              // 请求权限
-			              uni.authorize({
-			                scope: 'scope.camera',
-			                success() {
-			                  // 权限已经获取，可以调用相机
-			                  _that.srcFileImage()
-			                },
-			                fail() {
-			                  // 用户拒绝授权，需引导用户开启权限
-			                  uni.showModal({
-			                    title: '提示',
-			                    content: '需要相机权限才能使用相机功能，请在设置中打开',
-			                    success: (modalRes) => {
-			                      if (modalRes.confirm) {
-			                        // 引导用户去设置中打开权限
-			                        uni.openSetting({
-			                        	success(res) {
-			                        		if (res.authSetting['scope.camera']) {
-			                        			re()
-			                        			// 授权成功
-			                        		} else {
-			                        			// 没有允许相机权限
-			                        			wx.showToast({
-			                        				title: '您拒绝了相机权限，将无法使用相机功能',
-			                        				icon: 'none'
-			                        			});
-			                        			rj('拒绝了相机权限')
-			                        		}
-			                        	},
-			                        	fail() {
-			                        		rj('openSetting调用失败')
-			                        	}
-			                        })
-			                      }
-			                    },
-			                  });
-			                },
-			              });
-			            } else {
-			              // 权限已经获取，可以直接调用相机
-			              _that.srcFileImage()
-			            }
-			          },
-			          fail(err) {
-			            // 获取设置失败
-			            console.error(err);
-			          },
-			        });
-			      },
 			  //调起上传图片
 			  srcFileImage() {
 			  	let _that = this
@@ -447,6 +452,15 @@
 				  	})
 				  }
 			  },
+			  setMainImage(index){
+				  this.productDate.images.forEach((tab,i)=>{
+					  if(i == index){
+						  tab.mainMark = 1
+					  }else{
+						  tab.mainMark = ''
+					  }
+				  })
+			  },
 			  clearImage(index){
 				if(this.productDate.images[index].mainMark == 1){
 					this.productDate.images.splice(index,1)
@@ -455,17 +469,21 @@
 					this.productDate.images.splice(index,1)
 				}
 			  },
-			  picker2(e){
-				  console.log(e.detail.value)
-				  this.productDate.value = e.detail.value
-			  },
 			  closed(){
-				  uni.navigateTo({
-				  	url: '/pages/index/index'
-				  })
+				  uni.navigateBack()
 			  },
 			  addCompleted(){
-				  
+				  if(this.radioItem[0].checked =true){
+					this.productDate.newMark == '1'
+				  }else{
+					  this.productDate.newMark == '2'
+				  }
+				  if(this.radioItem[1].checked =true){
+					  this.productDate.recommend == '1'
+				  }else{
+					  this.productDate.recommend == '2'
+				  }
+				  this.productDate.stockList  =  this.stockList
 			  }
 		}
 	}
@@ -549,7 +567,6 @@
 			.tagButton{
 				display: inline-block;
 				width: 133rpx;
-				height: 58rpx;
 				background: #f5f5f5;
 				color: #666666;
 				border-radius: 8rpx;
@@ -584,6 +601,8 @@
 				display: inline-block;
 				width: 140rpx;
 				height: 140rpx;
+				vertical-align: middle;
+				text-align: center;
 				position: relative;
 				>image{
 					width: 100%;
diff --git a/pages.json b/pages.json
index cf9ca96..5a51986 100644
--- a/pages.json
+++ b/pages.json
@@ -103,6 +103,9 @@
 			},{
 				"path": "productAddition/index",
 				"style": {}
+			},{
+				"path": "productUpdate/index",
+				"style": {}
 			}]
 		},
 		{
-- 
2.49.1


From 7cf3af639dbf1e89ed27c3ea5dc6ecc048298a0b Mon Sep 17 00:00:00 2001
From: zhangyouji <zhangyouji@sdxkhlw.cn>
Date: Tue, 9 Apr 2024 08:56:34 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageIntegral/productAddition/index.vue | 102 ++++++++++---
 packageIntegral/productList/index.vue     |  20 +--
 packageIntegral/productUpdate/index.vue   | 178 ++++++++++++++--------
 3 files changed, 202 insertions(+), 98 deletions(-)

diff --git a/packageIntegral/productAddition/index.vue b/packageIntegral/productAddition/index.vue
index 320c023..bab6ca5 100644
--- a/packageIntegral/productAddition/index.vue
+++ b/packageIntegral/productAddition/index.vue
@@ -6,7 +6,7 @@
 		</cu-custom>
     <view id="chooseType" :class="currentBoxId == 'chooseType' ? 'show' : 'hidden'">
 		<uni-forms ref="productForm" :modelValue="productDate" :rules="rules" label-width="200rpx">
-					<uni-forms-item label="商品分类:" name="name">
+					<uni-forms-item label="商品分类:" name="demandRegion">
 						<mulpicker
 						        v-model="productDate.demandRegion"
 						        :list="productList" 
@@ -74,20 +74,20 @@
 									<view class="uni-px-5" v-for="(item,index) in attributesList">
 										<view style="display: inline-block;">{{item.attributeName}}：</view>
 										<view  style="display: inline-block;">
-											<uni-data-checkbox v-if="index==0" mode="tag" v-model="radioAttributes" :localdata="item.attributesList"></uni-data-checkbox>
-										<uni-data-checkbox v-else-if="index!=0" mode="tag" multiple v-model="checkboxAttributes" :localdata="hobby"></uni-data-checkbox>
+											<uni-data-checkbox v-if="index==0" mode="tag" @change="changeRadio(item,index)" v-model="radioAttributes" :localdata="item.attributesList"></uni-data-checkbox>
+										<uni-data-checkbox v-else-if="index!=0" mode="tag" @change="changeCheckBox(item,index)" multiple v-model="checkboxAttributes" :localdata="item.attributesList"></uni-data-checkbox>
 										</view>
 										
 									</view>
 								</uni-section>
 					</view>
 				</view>
-				<view>
+				<view  style="padding-bottom: 20rpx;border-bottom: 1rpx solid #f6f6f6;">
 					<view>批量填充：<text style="color: #999999;margin: 10rpx 0;">批量填充填入信息后，可以批量将内容填写到SKU 信息里</text></view>
-					<view class="tagButton" @tap="changeChecked(item)" v-for="item in bottonList">{{item.label}}</view>
+					<view class="tagButton" v-for="item in bottonList">{{item.label}}</view>
 					<view class="redButton" @tap="addStockList">确定</view>
 				</view>
-				<view v-for="(items,index) in stockList">
+				<view style="padding: 20rpx 0;;border-bottom: 1rpx solid #f6f6f6;" v-for="(items,index) in stockList">
 					<view style="margin: 10rpx 0;">
 						<text style="color: red;">*</text>
 						<text>规格：</text>
@@ -163,6 +163,7 @@
 				currentBoxId: 'chooseType', //当前显示的view的id
 				isBoxShow: false,
 				productDate:{
+					productStatus:'1',
 					images:[]
 				},
 				productList:[],
@@ -175,9 +176,9 @@
 					  checked: false
 					 }],
 					 rules:{
-						 name:{rules:[{required: true,errorMessage: '请选择商品分类'}]},
+						 demandRegion:{rules:[{required: true,errorMessage: '请选择商品分类'}]},
 						 productName:{rules:[{required: true,errorMessage: '请输入商品名称'}]},
-						 brandId:{rules:[{required: true,errorMessage: '请输入商品品牌'}]},
+						 brandId:{rules:[{required: true,errorMessage: '请选择商品品牌'}]},
 						 price:{rules:[{required: true,errorMessage: '请输入商品售价'}]},
 					 },
 					 attributesTypeList:[],
@@ -190,7 +191,8 @@
 					 ],
 					 radioAttributes:'',
 					 checkboxAttributes:[],
-					 stockList:[]
+					 stockList:[],
+					 checkedList:[]
 			}
 		},
 
@@ -205,6 +207,11 @@
 					this.productDate.categoryOneId = val.split(',')[0]
 					this.productDate.categoryTwoId = val.split(',')[1]
 				}
+			},
+			'productDate.attributesTypeId'(val){
+				if(!val){
+					this.stockList = []
+				}
 			}
 		},
 		methods: {
@@ -257,20 +264,40 @@
 			 },
 			  changeBox(e){
 			    let currentFlag = e.currentTarget.id;
-			    switch(currentFlag){
-			      case 'next':
-			          this.currentBoxId = 'instruction'
-			        break;
-			      case 'previous':
-			          this.currentBoxId = 'chooseType'
-			        break;
-			        default:
-			            this.currentBoxId = 'viewInstruction'
-			          break;
-			    }
 				if(currentFlag == 'next'){
-					this.getAttributesType()
+					this.$refs.productForm.validate().then(res=>{
+						console.log('表单数据信息：', res);
+						switch(currentFlag){
+						  case 'next':
+						      this.currentBoxId = 'instruction'
+						    break;
+						  case 'previous':
+						      this.currentBoxId = 'chooseType'
+						    break;
+						    default:
+						        this.currentBoxId = 'viewInstruction'
+						      break;
+						}
+						if(currentFlag == 'next'){
+							this.getAttributesType()
+						}
+					}).catch(err =>{
+						console.log('表单错误信息：', err);
+					})
+				}else{
+					switch(currentFlag){
+					  case 'next':
+					      this.currentBoxId = 'instruction'
+					    break;
+					  case 'previous':
+					      this.currentBoxId = 'chooseType'
+					    break;
+					    default:
+					        this.currentBoxId = 'viewInstruction'
+					      break;
+					}
 				}
+			    
 			  },
 			  getAttributesType(){
 				  this.attributesTypeList = []
@@ -304,6 +331,25 @@
 				  }
 				  
 			  },
+			  changeRadio(item,index){
+				  if(JSON.stringify(this.checkedList) ==  '[]'){
+					  this.checkedList.push({attributeId:item.id,checked:item.attributeName})
+				  }else{
+					  this.checkedList[index].checked = item.attributeName
+				  }
+			  },
+			  changeCheckBox(item,index){
+				  if(this.checkedList.length<index+1){
+					  this.checkedList.push({attributeId:item.id,checked:item.attributeName})
+				  }else{
+					  let checked = []
+					  this.checkboxAttributes.forEach(tab=>{
+						  checked.push(tab)
+					  })
+					  this.checkedList[index].checked = checked.join(',')
+					  this.checkedList.checked
+				  }
+			  },
 			  deleteCheckAll(i){
 				  if(this.checkboxAttributes.length>1){
 					  this.checkboxAttributes.splice(i,1)
@@ -358,7 +404,6 @@
 			  		sourceType: ['album'], //从相册选择
 			  		success: function(res) {
 			  			console.log(res)
-			  			console.log('进入1')
 			  			const JSESSIONID = utils.uuid()
 			  			uni.uploadFile({
 			  				url: 'http://uat.xingoil.com/adminapi/oil-oss/obejct/uploadFile',
@@ -379,14 +424,11 @@
 			  					'token': utils.md5Salt(JSESSIONID)
 			  				},
 			  				success(e) {
-			  					console.log('进入2')
-			  					console.log(e)
 			  					let obj = JSON.parse(e.data),
 			  						imageUrl = obj.data.publicUrl
 									_that.getImage(imageUrl)
 			  				},
 							fail(err) {
-								console.log(err)
 							}
 			  			})
 			  		},fail() {
@@ -440,9 +482,15 @@
 				  }else{
 					  this.productDate.recommend == '2'
 				  }
+				  this.productDate.checkedList = this.checkedList
 				  this.productDate.stockList  =  this.stockList
 				  serve.saveProduct(this.productDate).then(res=>{
 					  console.log(res)
+					  uni.showToast({
+					  	title: res.msg,
+					  	icon: 'none'
+					  })
+					  this.closed()
 				  })
 			  }
 		}
@@ -524,6 +572,10 @@
 					line-height: 72rpx;
 				}
 			}
+			.content{
+				padding-bottom: 20rpx;
+				border-bottom: 1rpx solid #F6F6F6;
+			}
 			.tagButton{
 				display: inline-block;
 				width: 133rpx;
diff --git a/packageIntegral/productList/index.vue b/packageIntegral/productList/index.vue
index e98ebdb..6a7a5dd 100644
--- a/packageIntegral/productList/index.vue
+++ b/packageIntegral/productList/index.vue
@@ -17,12 +17,12 @@
 
 		<scroll-view v-if="dataList.length" class="list" :scroll-y="true" @scrolltolower="lower">
 			<view class="item" v-for="item,index in dataList" :key="index">
-				<view class="header" @click="toDetails(item)">
+				<view class="header">
 					<view class="identifying"
 					 :style="{background:identifying[item.productStatus].background,
 					 opacity:identifying[item.productStatus].opacity}">{{item.productStatus =='1'?'已上架':'未上架'}}</view>
 				</view>
-				<view class="introduce" @click="toDetails(item)">
+				<view class="introduce">
 					<image :src="item.url"></image>
 					<view>{{item.productName}}</view>
 					<view>规格：默认</view>
@@ -192,11 +192,11 @@
 				}, '')
 				return text
 			},
-			toDetails(item) {
-				uni.navigateTo({
-					url: `../orderDetails/index?orderId=${item.id}`
-				})
-			},
+			// toDetails(item) {
+			// 	uni.navigateTo({
+			// 		url: `../orderDetails/index?orderId=${item.id}`
+			// 	})
+			// },
 			getTopInfo(){
 				serve.getTopInfo(this.paramter).then(res => {
 					if (res.code === 20000) {
@@ -246,7 +246,7 @@
 				uni.navigateTo({
 					url: `../productUpdate/index?id=${item.id}`
 				})
-				
+
 			},
 			upDownFrame(item) {
 				this.productData = item
@@ -260,7 +260,7 @@
 				}else if(this.productData.productStatus ==2){
 					data.productStatus = 1
 				}
-				
+
 				serve.productStatus(data).then(res=>{
 					uni.showToast({
 						title: res.msg,
@@ -489,7 +489,7 @@
 						width: 160rpx;
 					}
 				}
-				
+
 				.header{
 					font-size: 32rpx;
 					color: #000;
diff --git a/packageIntegral/productUpdate/index.vue b/packageIntegral/productUpdate/index.vue
index 5d9665e..0f9f715 100644
--- a/packageIntegral/productUpdate/index.vue
+++ b/packageIntegral/productUpdate/index.vue
@@ -6,14 +6,14 @@
 		</cu-custom>
     <view id="chooseType" :class="currentBoxId == 'chooseType' ? 'show' : 'hidden'">
 		<uni-forms ref="productForm" :modelValue="productDate" :rules="rules" label-width="200rpx">
-					<uni-forms-item label="商品分类:" name="name">
+					<uni-forms-item label="商品分类:" name="demandRegion">
 						<mulpicker
 						        v-model="productDate.demandRegion"
-						        :list="productList" 
+						        :list="productList"
 						    rangekey="categoryName"
 						    code="id"
-						    pidkey="id" 
-						    childkey="classificationTwoList" 
+						    pidkey="id"
+						    childkey="classificationTwoList"
 						    :emitPath="true"
 						    :level="2"
 						    :placeholder="'选择商品分类'"
@@ -55,8 +55,8 @@
 			<view id="next" @click="changeBox">下一步</view>
 			</view>
 		</view>
-		
- 
+
+
     <view id="instruction" :class="currentBoxId == 'instruction' ? 'show' : 'hidden'">
 		<uni-forms :modelValue="productDate" label-width="200rpx">
 					<uni-forms-item label="属性类别:" >
@@ -74,20 +74,20 @@
 									<view class="uni-px-5" v-for="(item,index) in attributesList">
 										<view style="display: inline-block;">{{item.attributeName}}：</view>
 										<view  style="display: inline-block;">
-											<uni-data-checkbox v-if="index==0" mode="tag" v-model="radioAttributes" :localdata="item.attributesList"></uni-data-checkbox>
-										<uni-data-checkbox v-else-if="index!=0" mode="tag" multiple v-model="checkboxAttributes" :localdata="hobby"></uni-data-checkbox>
+                      <uni-data-checkbox v-if="index==0" mode="tag" @change="changeRadio(item,index)" v-model="radioAttributes" :localdata="item.attributesList"></uni-data-checkbox>
+                      <uni-data-checkbox v-else-if="index!=0" mode="tag" @change="changeCheckBox(item,index)" multiple v-model="checkboxAttributes" :localdata="item.attributesList"></uni-data-checkbox>
 										</view>
-										
+
 									</view>
 								</uni-section>
 					</view>
 				</view>
-				<view>
+				<view style="padding-bottom: 20rpx;border-bottom: 1rpx solid #f6f6f6;">
 					<view>批量填充：<text style="color: #999999;margin: 10rpx 0;">批量填充填入信息后，可以批量将内容填写到SKU 信息里</text></view>
 					<view class="tagButton" @tap="changeChecked(item)" v-for="item in bottonList">{{item.label}}</view>
 					<view class="redButton" @tap="addStockList">确定</view>
 				</view>
-				<view v-for="(items,index) in stockList">
+				<view style="padding: 20rpx 0;;border-bottom: 1rpx solid #f6f6f6;" v-for="(items,index) in stockList">
 					<view style="margin: 10rpx 0;">
 						<text style="color: red;">*</text>
 						<text>规格：</text>
@@ -131,7 +131,7 @@
 								<uni-icons type="camera-filled" size="30"></uni-icons>
 							</view>
 						</view>
-					
+
 				</view>
 				<!-- <view>
 					<view>详情图片：<text style="color: #999999;">最多可上传10张图片</text></view>
@@ -143,7 +143,7 @@
 			<view @click="addCompleted">完成</view>
 		</view>
     </view>
- 
+
 
 
 
@@ -163,6 +163,7 @@
 				currentBoxId: 'chooseType', //当前显示的view的id
 				isBoxShow: false,
 				productDate:{
+          productStatus:'1',
 					images:[]
 				},
 				productList:[],
@@ -175,9 +176,9 @@
 					  checked: false
 					 }],
 					 rules:{
-						 name:{rules:[{required: true,errorMessage: '请选择商品分类'}]},
+             demandRegion:{rules:[{required: true,errorMessage: '请选择商品分类'}]},
 						 productName:{rules:[{required: true,errorMessage: '请输入商品名称'}]},
-						 brandId:{rules:[{required: true,errorMessage: '请输入商品品牌'}]},
+						 brandId:{rules:[{required: true,errorMessage: '请选择商品品牌'}]},
 						 price:{rules:[{required: true,errorMessage: '请输入商品售价'}]},
 					 },
 					 attributesTypeList:[],
@@ -190,7 +191,8 @@
 					 ],
 					 radioAttributes:'',
 					 checkboxAttributes:[],
-					 stockList:[]
+					 stockList:[],
+        checkedList:[]
 			}
 		},
 
@@ -207,7 +209,12 @@
 					this.productDate.categoryOneId = val.split(',')[0]
 					this.productDate.categoryTwoId = val.split(',')[1]
 				}
-			}
+			},
+      'productDate.attributesTypeId'(val){
+        if(!val){
+          this.stockList = []
+        }
+      }
 		},
 		methods: {
 			getEdit(options){
@@ -236,6 +243,7 @@
 								})
 							}
 						})
+						this.checkedList = this.productDate.checkedList
 						if(this.productDate.checkedList.length==1){
 							this.radioAttributes = this.productDate.checkedList[0].checked
 						}else{
@@ -247,8 +255,8 @@
 							})
 						}
 						this.stockList = this.productDate.stockList
-						
-						
+
+
 					}
 					console.log(res.data)
 				})
@@ -272,7 +280,7 @@
 					res.data.forEach(tab=>{
 						this.brandIdList.push({value:tab.id,text:tab.brandName})
 					})
-					
+
 				})
 			},
 			checkbox (e) {
@@ -298,24 +306,44 @@
 				 }else{
 					 this.productDate.recommend = 2
 				 }
-		
+
 			 },
 			  changeBox(e){
 			    let currentFlag = e.currentTarget.id;
-			    switch(currentFlag){
-			      case 'next':
-			          this.currentBoxId = 'instruction'
+          if(currentFlag == 'next'){
+            this.$refs.productForm.validate().then(res=>{
+              console.log('表单数据信息：', res);
+              switch(currentFlag){
+                case 'next':
+                  this.currentBoxId = 'instruction'
+                  break;
+                case 'previous':
+                  this.currentBoxId = 'chooseType'
+                  break;
+                default:
+                  this.currentBoxId = 'viewInstruction'
+                  break;
+              }
+              if(currentFlag == 'next'){
+                this.getAttributesType()
+              }
+            }).catch(err =>{
+              console.log('表单错误信息：', err);
+            })
+          }else{
+			  switch(currentFlag){
+			    case 'next':
+			        this.currentBoxId = 'instruction'
+			      break;
+			    case 'previous':
+			        this.currentBoxId = 'chooseType'
+			      break;
+			      default:
+			          this.currentBoxId = 'viewInstruction'
 			        break;
-			      case 'previous':
-			          this.currentBoxId = 'chooseType'
-			        break;
-			        default:
-			            this.currentBoxId = 'viewInstruction'
-			          break;
-			    }
-				if(currentFlag == 'next'){
-					this.getAttributesType()
-				}
+			  }
+		  }
+
 			  },
 			  getAttributesType(){
 				  this.attributesTypeList = []
@@ -328,7 +356,7 @@
 							attributesList:tab.attributesList
 							})
 					})
-				})  
+				})
 			  },
 			  attributesData(){
 				  if(this.productDate.attributesTypeId){
@@ -341,14 +369,33 @@
 								  tab.attributesList.push({value:item,text:item})
 							  })
 						  })
-						  
+
 					  }
-				  })  
+				  })
 				  }else{
 					  this.attributesList = []
 				  }
-				  
+
 			  },
+      changeRadio(item,index){
+        if(JSON.stringify(this.checkedList) ==  '[]'){
+          this.checkedList.push({attributeId:item.id,checked:item.attributeName})
+        }else{
+          this.checkedList[index].checked = item.attributeName
+        }
+      },
+      changeCheckBox(item,index){
+        if(this.checkedList.length<index+1){
+          this.checkedList.push({attributeId:item.id,checked:item.attributeName})
+        }else{
+          let checked = []
+          this.checkboxAttributes.forEach(tab=>{
+            checked.push(tab)
+          })
+          this.checkedList[index].checked = checked.join(',')
+          this.checkedList.checked
+        }
+      },
 			  deleteCheckAll(i){
 				  if(this.checkboxAttributes.length>1){
 					  this.checkboxAttributes.splice(i,1)
@@ -390,7 +437,7 @@
 						  obj.attributeJson = JSON.stringify(data)
 						  this.stockList.push(obj)
 					  })
-					  
+
 				  }
 			  },
 			  //调起上传图片
@@ -402,8 +449,6 @@
 			  		sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
 			  		sourceType: ['album'], //从相册选择
 			  		success: function(res) {
-			  			console.log(res)
-			  			console.log('进入1')
 			  			const JSESSIONID = utils.uuid()
 			  			uni.uploadFile({
 			  				url: 'http://uat.xingoil.com/adminapi/oil-oss/obejct/uploadFile',
@@ -424,14 +469,11 @@
 			  					'token': utils.md5Salt(JSESSIONID)
 			  				},
 			  				success(e) {
-			  					console.log('进入2')
-			  					console.log(e)
 			  					let obj = JSON.parse(e.data),
 			  						imageUrl = obj.data.publicUrl
 									_that.getImage(imageUrl)
 			  				},
 							fail(err) {
-								console.log(err)
 							}
 			  			})
 			  		},fail() {
@@ -483,21 +525,31 @@
 				  }else{
 					  this.productDate.recommend == '2'
 				  }
+				  this.productDate.checkedList = this.checkedList
 				  this.productDate.stockList  =  this.stockList
+				  serve.updateProduct(this.productDate).then(res=>{
+				  					  uni.showToast({
+				  					  	title: res.msg,
+				  					  	icon: 'none'
+				  					  })
+									  uni.navigateTo({
+									  	url: `../productList/index`
+									  })
+				  })
 			  }
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	
+
 		.fadeBox{
 		    width: 100%;
 		    margin-bottom: 20rpx;
 		}
 		#chooseType{
 		padding: 30rpx;
-		
+
 		mulpicker{
 			height: 72rpx;
 			line-height: 72rpx;
@@ -509,12 +561,12 @@
 			font-size: 28rpx;
 			font-weight: bold;
 		}
-		
-		
+
+
 		/deep/ .uni-forms-item{
 			width: 100%;
 		}
-		
+
 		/deep/ .uni-forms-item__label{
 			color: #333 !important;
 			font-size: 30rpx;
@@ -527,7 +579,7 @@
 				line-height: 72rpx;
 			}
 		}
-		
+
 		switch{
 			margin-top: 9rpx;
 		}
@@ -536,11 +588,11 @@
 		 }
 		 switch::after{
 			 content: '';
-		 }	
+		 }
 		}
 		#instruction{
 			padding: 30rpx;
-			
+
 			mulpicker{
 				height: 72rpx;
 				line-height: 72rpx;
@@ -551,7 +603,7 @@
 			/deep/ .uni-forms-item{
 				width: 100%;
 			}
-			
+
 			/deep/ .uni-forms-item__label{
 				color: #333 !important;
 				font-size: 30rpx;
@@ -627,9 +679,9 @@
 					z-index: 20;
 				}
 			}
-			
+
 		}
-		
+
 		.checkbox-con{
 		 margin-top: 40rpx;
 		 text-align: center;
@@ -654,7 +706,7 @@
 			 left: 50rpx;
 		 }
 		}
-		
+
 		.checked{
 		 color: #FFFFFF;
 		 background: #FE0606;
@@ -663,16 +715,16 @@
 		.checkbox checkbox{
 		 display: none
 		}
-		 
-		 
-		 
-		 
+
+
+
+
 		.buttons {
 			width: 100%;
 			display: flex;
 			justify-content: space-evenly;
 			margin-top: 180rpx;
-		
+
 			>view {
 				width: 250rpx;
 				height: 76rpx;
@@ -680,13 +732,13 @@
 				line-height: 76rpx;
 				border-radius: 10rpx;
 				font-size: 28rpx;
-		
+
 				&:nth-of-type(1) {
 					background: #FFFFFF;
 					border: 1rpx solid #B6B6B6;
 					color: #333;
 				}
-		
+
 				&:nth-of-type(2) {
 					background: #FE0505;
 					color: #fff;
-- 
2.49.1


From a0b52f8a4c81b2a675cd010826f691a3d6100e5b Mon Sep 17 00:00:00 2001
From: zhangyouji <zhangyouji@sdxkhlw.cn>
Date: Fri, 12 Apr 2024 17:09:32 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageElectron/components/autograph.vue      |    8 +
 packageElectron/index.vue                     |  293 ++++
 .../reconciliationDetails/index.vue           |    8 +
 packageIntegral/productAddition/index.vue     | 1242 ++++++++--------
 packageIntegral/productList/index.vue         |   89 +-
 packageIntegral/productUpdate/index.vue       | 1279 +++++++++--------
 pages.json                                    |   15 +
 pages/home/home.vue                           |    6 +
 8 files changed, 1735 insertions(+), 1205 deletions(-)
 create mode 100644 packageElectron/components/autograph.vue
 create mode 100644 packageElectron/index.vue
 create mode 100644 packageElectron/reconciliationDetails/index.vue

diff --git a/packageElectron/components/autograph.vue b/packageElectron/components/autograph.vue
new file mode 100644
index 0000000..02409e3
--- /dev/null
+++ b/packageElectron/components/autograph.vue
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/packageElectron/index.vue b/packageElectron/index.vue
new file mode 100644
index 0000000..ff853b0
--- /dev/null
+++ b/packageElectron/index.vue
@@ -0,0 +1,293 @@
+<template>
+	<view class="container">
+		<cu-custom class="main-totextbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
+			<block slot="backText">返回</block>
+			<block slot="content">商品列表</block>
+		</cu-custom>
+
+		<view class="options-frame">
+			<view v-for="item,index in optionsList" :key="index" :class="index == currentIndex ? 'active':''"
+				@click="selectOptions(index)">{{item.text}}<text>({{item.count}})</text></view>
+		</view>
+
+		<scroll-view v-if="dataList.length" class="list" :scroll-y="true" @scrolltolower="lower">
+			<view class="item" v-for="item,index in dataList" :key="index">
+			
+				<view class="introduce">
+					<image :src="item.url"></image>
+					<view>{{item.productName}}</view>
+					<view>规格：默认</view>
+					<view>库存：{{item.totalStock}}</view>
+				</view>
+				<view class="footer">
+					<view class="button">删除</view>
+					<view class="button">编辑</view>
+				</view>
+			</view>
+			<view style="height: 30rpx; background: #fff;"></view>
+		</scroll-view>
+		<view v-else class="empty">
+			<image src="https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/yunsite-empty.png"></image>
+			<view>暂无对账单~</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import serve from '@/api/packageIntegral/productList.js'
+
+	export default {
+		options: {
+			styleIsolation: 'shared'
+		},
+		data() {
+			return {
+				currentIndex: 0,
+				paramter: {
+					currentPage: 1,
+					pagesize: 20,
+					params: {},
+				},
+				dataList: [{},{}],
+				optionsList: [{
+					text: '全部',
+					count: 0,
+					value: ''
+				}, {
+					text: '待确认',
+					count: 0,
+					value: ''
+				}, {
+					text: '已确认',
+					count: 0,
+					value: ''
+				}, {
+					text: '金额异常',
+					count: 0,
+					value: ''
+				}],
+		
+		
+			}
+		},
+
+		onLoad() {
+			// this.productByPage()
+			// this.getTopInfo()
+		},
+
+		methods: {
+			selectOptions(index) {
+				this.currentIndex = index
+				console.log(index,'index')
+				if(index == 0){
+					this.paramter.params ={}
+				}else if(index ==1){
+					this.paramter.params ={}
+					this.paramter.params.productStatus = 1
+				}else if(index ==2){
+					this.paramter.params ={}
+					this.paramter.params.productStatus = 2
+				}else if(index ==3){
+					this.paramter.params ={}
+					this.paramter.params.auditStatus = 1
+				}
+				// this.productByPage()
+			},
+		
+	
+		
+			lower() {
+				this.paramter.currentPage += 1
+				// this.productByPage()
+			},
+	
+		
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		background: #f1f2f7 !important;
+		>.options-frame {
+			display: flex;
+			justify-content: space-between;
+			margin-top: 43rpx;
+			padding: 0 31rpx;
+
+
+			>view {
+				width: 144rpx;
+				height: 66rpx;
+				font-size: 25rpx;
+				line-height: 66rpx;
+				text-align: center;
+				color: #000000;
+				background: #F7F7F7;
+
+				>text {
+					color: #F83D3D;
+				}
+
+				&.active {
+					color: #FFF;
+					background: #F83D3D;
+
+					>text {
+						color: #fff;
+					}
+				}
+			}
+		}
+
+
+		>.list {
+			margin-top: 35rpx;
+			flex: 1;
+			overflow-y: hidden;
+
+			.item {
+				position: relative;
+				margin-top: 20rpx;
+				background: #fff;
+				// min-height: 106rpx;
+				// border-bottom: 12rpx solid #F1F2F7;
+
+				&:nth-of-type(1) {
+					margin-top: 0
+				}
+
+				.header {
+					// padding: 26rpx 23rpx 0;
+					height: 60rpx;
+					// line-height: 83rpx;
+					width: 100%;
+					font-size: 30rpx;
+					color: #666;
+					border-top: 1rpx solid #D7D7D7;
+
+					.identifying{
+						width: 120rpx;
+						height: 60rpx;
+						line-height: 60rpx;
+						// background-color: #F83D3D;
+						color: #FFF;
+						text-align: center;
+						border-bottom-right-radius: 30rpx;
+					}
+				}
+
+				.introduce {
+					position: relative;
+					padding: 24rpx 29rpx 31rpx 268rpx;
+					min-height: 220rpx;
+
+					>image {
+						position: absolute;
+						top: 13rpx;
+						left: 34rpx;
+						width: 220rpx;
+						height: 220rpx;
+						// border: 1px solid #333;
+					}
+
+					>view {
+						&:nth-of-type(1) {
+							font-size: 28rpx;
+							color: #000;
+						}
+
+						&:nth-of-type(2),
+						&:nth-of-type(3) {
+							margin-top: 11rpx;
+							font-size: 24rpx;
+							color: #999;
+						}
+
+						&:nth-of-type(3) {
+							margin-top: 18rpx;
+
+						}
+
+						&:nth-of-type(4) {
+							margin-top: 11rpx;
+							font-size: 28rpx;
+							color: #F83D3D;
+						}
+					}
+				}
+				.examine{
+					width: 120rpx;
+					height: 45rpx;
+					color: #FFF;
+					text-align: center;
+					line-height: 45rpx;
+					position: absolute;
+					right: 50rpx;
+					top: 180rpx;
+				}
+
+				>.footer {
+					position: relative;
+					height: 58rpx;
+					line-height: 58rpx;
+					padding: 0 34rpx 40rpx;
+					font-size: 32rpx;
+					color: #000;
+					font-weight: 550;
+
+					.button {
+						position: absolute;
+						top: 0;
+						width: 128rpx;
+						height: 58rpx;
+						line-height: 58rpx;
+						text-align: center;
+						font-size: 28rpx;
+						color: #999;
+						background: #FFF;
+						border: 1px solid #999;
+						border-radius: 10rpx;
+					}
+
+					>.button{
+						&:nth-of-type(1){
+							right: 360rpx;
+						}
+						&:nth-of-type(2){
+							right: 200rpx;
+						}
+						&:nth-of-type(3){
+							right: 40rpx;
+						}
+
+					}
+				}
+			}
+		}
+
+		
+
+		>.empty {
+			margin: 218rpx auto 0;
+
+			>image {
+				width: 473rpx;
+				height: 404rpx;
+			}
+
+			>view {
+				margin-top: 45rpx;
+				text-align: center;
+				font-size: 28rpx;
+				color: #999;
+			}
+		}
+
+	}
+</style>
diff --git a/packageElectron/reconciliationDetails/index.vue b/packageElectron/reconciliationDetails/index.vue
new file mode 100644
index 0000000..02409e3
--- /dev/null
+++ b/packageElectron/reconciliationDetails/index.vue
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/packageIntegral/productAddition/index.vue b/packageIntegral/productAddition/index.vue
index bab6ca5..54e42f7 100644
--- a/packageIntegral/productAddition/index.vue
+++ b/packageIntegral/productAddition/index.vue
@@ -4,95 +4,100 @@
 			<block slot="backText">返回</block>
 			<block slot="content">新增商品</block>
 		</cu-custom>
-    <view id="chooseType" :class="currentBoxId == 'chooseType' ? 'show' : 'hidden'">
-		<uni-forms ref="productForm" :modelValue="productDate" :rules="rules" label-width="200rpx">
-					<uni-forms-item label="商品分类:" name="demandRegion">
-						<mulpicker
-						        v-model="productDate.demandRegion"
-						        :list="productList" 
-						    rangekey="categoryName"
-						    code="id"
-						    pidkey="id" 
-						    childkey="classificationTwoList" 
-						    :emitPath="true"
-						    :level="2"
-						    :placeholder="'选择商品分类'"
-						/>
-						<uni-icons color="#666666" type="right" size="22" style="position: absolute;right: 0;top: 10rpx;"></uni-icons>
-					</uni-forms-item>
-					<uni-forms-item label="商品名称:" name="productName">
-						<input type="text" v-model="productDate.productName" placeholder="请输入商品名称" />
-					</uni-forms-item>
-					<uni-forms-item label="关键词:" name="keyword">
-						<input type="text" v-model="productDate.keyword" placeholder="请输入关键词(空格分隔)" />
-					</uni-forms-item>
-					<uni-forms-item label="商品品牌:" name="brandId">
-						<!-- <input type="text" v-model="productDate.brandId" placeholder="请输入商品品牌" /> -->
-						  <uni-data-select
-						        v-model="productDate.brandId"
-						        :localdata="brandIdList"
-								placeholder="请选择商品品牌"
-						      ></uni-data-select>
-					</uni-forms-item>
-					<uni-forms-item label="商品售价:" name="price">
-						<input type="text" v-model="productDate.price" placeholder="请输入商品售价" />
-					</uni-forms-item>
-					<uni-forms-item label="商品上架:" name="productStatus">
-						<switch v-model="productDate.productStatus" :checked="productDate.productStatus=='1'" color="#FE0606" @change="switchChange" style="transform:scale(0.7)" />
-					</uni-forms-item>
-					<uni-forms-item label="商品推荐:" name="age">
-						<view class='checkbox-con'>
-						 <radio-group>
-						  <label :class="item.checked?'checkbox checked':'checkbox'" @click="checkbox(index)" v-for="(item, index) in radioItem" :key="item.value">
-						  <checkbox :value="item.value" :checked="item.checked"/>{{item.name}}
-						  </label>
-						 </radio-group>
-						 </view>
-					</uni-forms-item>
-				</uni-forms>
+		<view id="chooseType" :class="currentBoxId == 'chooseType' ? 'show' : 'hidden'">
+			<uni-forms ref="productForm" :modelValue="productDate" :rules="rules" label-width="200rpx">
+				<uni-forms-item label="商品分类:" name="demandRegion">
+					<mulpicker v-model="productDate.demandRegion" :list="productList" rangekey="categoryName" code="id"
+						pidkey="id" childkey="classificationTwoList" :emitPath="true" :level="2"
+						:placeholder="'选择商品分类'" />
+					<uni-icons color="#666666" type="right" size="22"
+						style="position: absolute;right: 0;top: 10rpx;"></uni-icons>
+				</uni-forms-item>
+				<uni-forms-item label="商品名称:" name="productName">
+					<input type="text" v-model="productDate.productName" placeholder="请输入商品名称" />
+				</uni-forms-item>
+				<uni-forms-item label="关键词:" name="keyword">
+					<input type="text" v-model="productDate.keyword" placeholder="请输入关键词(空格分隔)" />
+				</uni-forms-item>
+				<uni-forms-item label="商品品牌:" name="brandId">
+					<!-- <input type="text" v-model="productDate.brandId" placeholder="请输入商品品牌" /> -->
+					<uni-data-select v-model="productDate.brandId" :localdata="brandIdList"
+						placeholder="请选择商品品牌"></uni-data-select>
+				</uni-forms-item>
+				<uni-forms-item label="商品售价:" name="price">
+					<input type="text" v-model="productDate.price" placeholder="请输入商品售价" />
+				</uni-forms-item>
+				<uni-forms-item label="商品上架:" name="productStatus">
+					<switch v-model="productDate.productStatus" :checked="productDate.productStatus=='1'"
+						color="#FE0606" @change="switchChange" style="transform:scale(0.7)" />
+				</uni-forms-item>
+				<uni-forms-item label="商品推荐:" name="age">
+					<view class='checkbox-con'>
+						<radio-group>
+							<label :class="item.checked?'checkbox checked':'checkbox'" @click="checkbox(index)"
+								v-for="(item, index) in radioItem" :key="item.value">
+								<checkbox :value="item.value" :checked="item.checked" />{{item.name}}
+							</label>
+						</radio-group>
+					</view>
+				</uni-forms-item>
+			</uni-forms>
 			<view class="buttons">
 				<view @click="closed">取消</view>
-			<view id="next" @click="changeBox">下一步</view>
+				<view id="next" @click="changeBox">下一步</view>
 			</view>
 		</view>
-		
- 
-    <view id="instruction" :class="currentBoxId == 'instruction' ? 'show' : 'hidden'">
-		<uni-forms :modelValue="productDate" label-width="200rpx">
-					<uni-forms-item label="属性类别:" >
-						  <uni-data-select
-						        v-model="productDate.attributesTypeId"
-						        :localdata="attributesTypeList"
-								placeholder="请选择商品品牌"
-								@change="attributesData"
-						      ></uni-data-select>
-					</uni-forms-item>
+
+
+		<view id="instruction" :class="currentBoxId == 'instruction' ? 'show' : 'hidden'">
+			<uni-forms :modelValue="productDate" label-width="200rpx">
+				<uni-forms-item label="属性类别:">
+					<uni-data-select v-model="productDate.attributesTypeId" :localdata="attributesTypeList"
+						placeholder="请选择商品品牌" @change="attributesData"></uni-data-select>
+				</uni-forms-item>
 				<view class="content" v-show="productDate.attributesTypeId">
 					<view style="margin: 10rpx 0;">商品类型：</view>
 					<view>
 						<uni-section type="line">
-									<view class="uni-px-5" v-for="(item,index) in attributesList">
-										<view style="display: inline-block;">{{item.attributeName}}：</view>
-										<view  style="display: inline-block;">
-											<uni-data-checkbox v-if="index==0" mode="tag" @change="changeRadio(item,index)" v-model="radioAttributes" :localdata="item.attributesList"></uni-data-checkbox>
-										<uni-data-checkbox v-else-if="index!=0" mode="tag" @change="changeCheckBox(item,index)" multiple v-model="checkboxAttributes" :localdata="item.attributesList"></uni-data-checkbox>
-										</view>
-										
-									</view>
-								</uni-section>
+							<view class="uni-px-5" v-for="(item,index) in attributesList">
+								<view style="display: inline-block;">{{item.attributeName}}：</view>
+								<view style="display: inline-block;">
+									<uni-data-checkbox v-if="index==0" mode="tag" @change="changeRadio(item,index)"
+										v-model="radioAttributes" :localdata="item.attributesList"></uni-data-checkbox>
+									<uni-data-checkbox v-else-if="index!=0" mode="tag"
+										@change="changeCheckBox(item,index)" multiple v-model="checkboxAttributes"
+										:localdata="item.attributesList"></uni-data-checkbox>
+								</view>
+
+							</view>
+						</uni-section>
 					</view>
 				</view>
-				<view  style="padding-bottom: 20rpx;border-bottom: 1rpx solid #f6f6f6;">
+				<view style="padding-bottom: 20rpx;border-bottom: 1rpx solid #f6f6f6;">
 					<view>批量填充：<text style="color: #999999;margin: 10rpx 0;">批量填充填入信息后，可以批量将内容填写到SKU 信息里</text></view>
-					<view class="tagButton" v-for="item in bottonList">{{item.label}}</view>
-					<view class="redButton" @tap="addStockList">确定</view>
+					<view style="display: inline-block;position: relative;" v-for="item in bottonList">
+						<view class="tagButton">
+							<input type="text" v-model="item.marketPrice" placeholder="市场价格" />
+						</view>
+						<view class="tagButton">
+							<input type="text" v-model="item.sellPrice" placeholder="销售价格" />
+						</view>
+						<view class="tagButton">
+							<input type="text" v-model="item.stock" placeholder="库存数量" />
+						</view>
+						<view class="tagButton">
+							<input type="text" v-model="item.integral" placeholder="积分价值" />
+						</view>
+						<view class="redButton" @tap="addStockList">确定</view>
+					</view>
 				</view>
 				<view style="padding: 20rpx 0;;border-bottom: 1rpx solid #f6f6f6;" v-for="(items,index) in stockList">
 					<view style="margin: 10rpx 0;">
 						<text style="color: red;">*</text>
 						<text>规格：</text>
-						<text v-if="index==0">{{radioAttributes}}</text>
-						<text v-if="index!=0">{{radioAttributes}}+{{checkboxAttributes[index]}}</text>
+						<text v-if="checkboxAttributes.length==0">{{radioAttributes}}</text>
+						<text
+							v-if="checkboxAttributes.length>0">{{radioAttributes}}+{{checkboxAttributes[index]}}</text>
 					</view>
 					<view class="tagButton">
 						<input type="text" v-model="items.marketPrice" placeholder="市场价格" />
@@ -106,44 +111,45 @@
 					<view class="tagButton">
 						<input type="text" v-model="items.integral" placeholder="积分价值" />
 					</view>
-					<view style="display: inline-block;vertical-align: top;margin-top: 10rpx;" @click="deleteCheckAll(index)">删除</view>
+					<view style="display: inline-block;vertical-align: top;margin-top: 10rpx;"
+						@click="deleteCheckAll(index)">删除</view>
 				</view>
 				<view>
 					<view style="margin: 10rpx 0;">
 						<text style="color: red;">*</text>
 						商品图片：
 						<text style="color: #999999;">最多可上传10张图片</text>
+					</view>
+					<view class="imageList" v-for="(items,index) in productDate.images">
+						<view class="imageBlack" v-if="items.mainMark==1">
+							<image :src="items.url"></image>
+							<view class="cameraText">商品主图</view>
+							<uni-icons class="cameraClear" type="clear" size="20" @tap="clearImage(index)"></uni-icons>
 						</view>
-							<view class="imageList" v-for="(items,index) in productDate.images">
-							<view class="imageBlack" v-if="items.mainMark==1">
-								<image :src="items.url"></image>
-								<view class="cameraText">商品主图</view>
-								<uni-icons class="cameraClear" type="clear" size="20" @tap="clearImage(index)"></uni-icons>
-							</view>
-							<view class="imageBlack" v-else-if="items.mainMark!=1">
-								<image :src="items.url"></image>
-								<view class="cameraText" @click="setMainImage(index)">设为主图</view>
-								<uni-icons class="cameraClear" type="clear" size="20" @tap="clearImage(index)"></uni-icons>
-							</view>
+						<view class="imageBlack" v-else-if="items.mainMark!=1">
+							<image :src="items.url"></image>
+							<view class="cameraText" @click="setMainImage(items,index)">设为主图</view>
+							<uni-icons class="cameraClear" type="clear" size="20" @tap="clearImage(index)"></uni-icons>
 						</view>
-						<view class="imageBlack" style="background-color: #fafafa;" @tap="srcFileImage">
-							<view style="margin-top: 46rpx;">
-								<uni-icons type="camera-filled" size="30"></uni-icons>
-							</view>
+					</view>
+					<view class="imageBlack" style="background-color: #fafafa;" @tap="srcFileImage">
+						<view style="margin-top: 46rpx;">
+							<uni-icons type="camera-filled" size="30"></uni-icons>
 						</view>
-					
+					</view>
+
 				</view>
 				<!-- <view>
 					<view>详情图片：<text style="color: #999999;">最多可上传10张图片</text></view>
 					<view></view>
 				</view> -->
-				</uni-forms>
-		<view class="buttons">
-			<view id="previous"  @click="changeBox">上一步</view>
-			<view @click="addCompleted">完成</view>
+			</uni-forms>
+			<view class="buttons">
+				<view id="previous" @click="changeBox">上一步</view>
+				<view @click="addCompleted">完成</view>
+			</view>
 		</view>
-    </view>
- 
+
 
 
 
@@ -155,44 +161,64 @@
 	import serve from '@/api/packageIntegral/productList.js'
 	import mulpicker from '@/packageIntegral/components/mulpicker.vue'
 	export default {
-	components: {
-		mulpicker
-	},
+		components: {
+			mulpicker
+		},
 		data() {
 			return {
 				currentBoxId: 'chooseType', //当前显示的view的id
 				isBoxShow: false,
-				productDate:{
-					productStatus:'1',
-					images:[]
+				productDate: {
+					productStatus: '1',
+					images: []
 				},
-				productList:[],
-				brandIdList:[],
-				radioItem:[{
-					  name: '新品',
-					  checked: true
-					 }, {
-					  name: '推荐',
-					  checked: false
-					 }],
-					 rules:{
-						 demandRegion:{rules:[{required: true,errorMessage: '请选择商品分类'}]},
-						 productName:{rules:[{required: true,errorMessage: '请输入商品名称'}]},
-						 brandId:{rules:[{required: true,errorMessage: '请选择商品品牌'}]},
-						 price:{rules:[{required: true,errorMessage: '请输入商品售价'}]},
-					 },
-					 attributesTypeList:[],
-					 attributesList:[],
-					 bottonList:[
-					 	{label:'市场价格',value:'marketPrice',checked:false},
-					 	{label:'销售价格',value:'sellPrice',checked:false},
-					 	{label:'商品库存',value:'stock',checked:false},
-					 	{label:'兑换积分',value:'integral',checked:false}
-					 ],
-					 radioAttributes:'',
-					 checkboxAttributes:[],
-					 stockList:[],
-					 checkedList:[]
+				productList: [],
+				brandIdList: [],
+				radioItem: [{
+					name: '新品',
+					checked: true
+				}, {
+					name: '推荐',
+					checked: false
+				}],
+				rules: {
+					demandRegion: {
+						rules: [{
+							required: true,
+							errorMessage: '请选择商品分类'
+						}]
+					},
+					productName: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入商品名称'
+						}]
+					},
+					brandId: {
+						rules: [{
+							required: true,
+							errorMessage: '请选择商品品牌'
+						}]
+					},
+					price: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入商品售价'
+						}]
+					},
+				},
+				attributesTypeList: [],
+				attributesList: [],
+				bottonList: [{
+					marketPrice: '',
+					sellPrice: '',
+					stock: '',
+					integral: ''
+				}],
+				radioAttributes: '',
+				checkboxAttributes: [],
+				stockList: [],
+				checkedList: []
 			}
 		},
 
@@ -201,515 +227,579 @@
 			this.getProductBrands()
 			this.getAttributesType()
 		},
-		watch:{
-			'productDate.demandRegion'(val){
-				if(val){
+		watch: {
+			'productDate.demandRegion'(val) {
+				if (val) {
 					this.productDate.categoryOneId = val.split(',')[0]
 					this.productDate.categoryTwoId = val.split(',')[1]
 				}
 			},
-			'productDate.attributesTypeId'(val){
-				if(!val){
+			'productDate.attributesTypeId'(val) {
+				if (!val) {
 					this.stockList = []
 				}
 			}
 		},
 		methods: {
-			switchChange(e){
-				if(e.detail.value == true){
+			switchChange(e) {
+				if (e.detail.value == true) {
 					this.productDate.productStatus = '1'
-				}else if(e.detail.value == false){
+				} else if (e.detail.value == false) {
 					this.productDate.productStatus = '2'
 				}
 			},
-			classfication(){
-				serve.classification().then(res=>{
+			classfication() {
+				serve.classification().then(res => {
 					this.productList = res.data
 				})
 			},
-			getProductBrands(){
+			getProductBrands() {
 				this.brandIdList = []
-				serve.getProductBrands().then(res=>{
-					console.log(res)
-					res.data.forEach(tab=>{
-						this.brandIdList.push({value:tab.id,text:tab.brandName})
+				serve.getProductBrands().then(res => {
+					res.data.forEach(tab => {
+						this.brandIdList.push({
+							value: tab.id,
+							text: tab.brandName
+						})
 					})
-					
+
 				})
 			},
-			checkbox (e) {
-				 var index = e;//获取当前点击的下标
-				 var checkboxArr = this.radioItem;//选项集合
-				 // if (checkboxArr[index].checked) return;//如果点击的当前已选中则返回
-				 // checkboxArr.forEach(item => {
-				 //  item.checked = false
-				 // })
-				 if(checkboxArr[index].checked ==false){
-					 checkboxArr[index].checked = true; //改变当前选中的checked值
+			checkbox(e) {
+				var index = e; //获取当前点击的下标
+				var checkboxArr = this.radioItem; //选项集合
+				// if (checkboxArr[index].checked) return;//如果点击的当前已选中则返回
+				// checkboxArr.forEach(item => {
+				//  item.checked = false
+				// })
+				if (checkboxArr[index].checked == false) {
+					checkboxArr[index].checked = true; //改变当前选中的checked值
 
-				 }else {
-					 checkboxArr[index].checked = false; //改变当前选中的checked值
-				 }
-				 if(checkboxArr[0].checked ==true){
-					 this.productDate.newMark = 1
-				 }else{
-					 this.productDate.newMark = 2
-				 }
-				 if(checkboxArr[1].checked ==true){
-					 this.productDate.recommend = 1
-				 }else{
-					 this.productDate.recommend = 2
-				 }
-		
-			 },
-			  changeBox(e){
-			    let currentFlag = e.currentTarget.id;
-				if(currentFlag == 'next'){
-					this.$refs.productForm.validate().then(res=>{
-						console.log('表单数据信息：', res);
-						switch(currentFlag){
-						  case 'next':
-						      this.currentBoxId = 'instruction'
-						    break;
-						  case 'previous':
-						      this.currentBoxId = 'chooseType'
-						    break;
-						    default:
-						        this.currentBoxId = 'viewInstruction'
-						      break;
+				} else {
+					checkboxArr[index].checked = false; //改变当前选中的checked值
+				}
+				if (checkboxArr[0].checked == true) {
+					this.productDate.newMark = 1
+				} else {
+					this.productDate.newMark = 2
+				}
+				if (checkboxArr[1].checked == true) {
+					this.productDate.recommend = 1
+				} else {
+					this.productDate.recommend = 2
+				}
+
+			},
+			changeBox(e) {
+				let currentFlag = e.currentTarget.id;
+				if (currentFlag == 'next') {
+					this.$refs.productForm.validate().then(res => {
+						switch (currentFlag) {
+							case 'next':
+								this.currentBoxId = 'instruction'
+								break;
+							case 'previous':
+								this.currentBoxId = 'chooseType'
+								break;
+							default:
+								this.currentBoxId = 'viewInstruction'
+								break;
 						}
-						if(currentFlag == 'next'){
+						if (currentFlag == 'next') {
 							this.getAttributesType()
 						}
-					}).catch(err =>{
-						console.log('表单错误信息：', err);
-					})
-				}else{
-					switch(currentFlag){
-					  case 'next':
-					      this.currentBoxId = 'instruction'
-					    break;
-					  case 'previous':
-					      this.currentBoxId = 'chooseType'
-					    break;
-					    default:
-					        this.currentBoxId = 'viewInstruction'
-					      break;
+					}).catch(err => {})
+				} else {
+					switch (currentFlag) {
+						case 'next':
+							this.currentBoxId = 'instruction'
+							break;
+						case 'previous':
+							this.currentBoxId = 'chooseType'
+							break;
+						default:
+							this.currentBoxId = 'viewInstruction'
+							break;
 					}
 				}
-			    
-			  },
-			  getAttributesType(){
-				  this.attributesTypeList = []
-				serve.getAttributesType().then(res=>{
-					res.data.forEach(tab=>{
+
+			},
+			getAttributesType() {
+				this.attributesTypeList = []
+				serve.getAttributesType().then(res => {
+					res.data.forEach(tab => {
 						this.attributesTypeList.push({
-							value:tab.id,
-							text:tab.name,
-							number:tab.number,
-							attributesList:tab.attributesList
-							})
+							value: tab.id,
+							text: tab.name,
+							number: tab.number,
+							attributesList: tab.attributesList
+						})
 					})
-				})  
-			  },
-			  attributesData(){
-				  if(this.productDate.attributesTypeId){
-					this.attributesTypeList.forEach(tab=>{
-					  if(tab.id = this.productDate.attributesTypeId){
-						  this.attributesList = tab.attributesList
-						  this.attributesList.forEach(tab=>{
-							  tab.attributesList = []
-							  tab.attributeContent.split(',').forEach(item=>{
-								  tab.attributesList.push({value:item,text:item})
-							  })
-						  })
-						  
-					  }
-				  })  
-				  }else{
-					  this.attributesList = []
-				  }
-				  
-			  },
-			  changeRadio(item,index){
-				  if(JSON.stringify(this.checkedList) ==  '[]'){
-					  this.checkedList.push({attributeId:item.id,checked:item.attributeName})
-				  }else{
-					  this.checkedList[index].checked = item.attributeName
-				  }
-			  },
-			  changeCheckBox(item,index){
-				  if(this.checkedList.length<index+1){
-					  this.checkedList.push({attributeId:item.id,checked:item.attributeName})
-				  }else{
-					  let checked = []
-					  this.checkboxAttributes.forEach(tab=>{
-						  checked.push(tab)
-					  })
-					  this.checkedList[index].checked = checked.join(',')
-					  this.checkedList.checked
-				  }
-			  },
-			  deleteCheckAll(i){
-				  if(this.checkboxAttributes.length>1){
-					  this.checkboxAttributes.splice(i,1)
-				  }else{
-					  this.checkboxAttributes.splice(i,1)
-					  this.radioAttributes = ''
-				  }
-				  this.stockList.splice(i,1)
-			  },
-			  deleteRadio(){
-				  this.radioAttributes = ''
-			  },
-			  changeChecked(item){
-				  item.checked = !item.checked
-			  },
-			  addStockList(){
-				  this.stockList = []
-				  let obj = {
-				  		marketPrice:'',
-				  		sellPrice:'',
-				  		stock:'',
-				  		integral:''
-				  }
-				  if(this.attributesList.length ==1){
-					  let data = {}
-					  let name = this.attributesList[0].attributeName
-					  let value = this.radioAttributes
-					  data[name] = value
-					  obj.attributeJson = JSON.stringify(data)
-					  this.stockList.push(obj)
-				  }else{
-					  this.checkboxAttributes.forEach((tab,index)=>{
-						  let name = this.attributesList[0].attributeName
-						  let value = this.radioAttributes
-						  let tabName = this.attributesList[index+1].attributeName
-						  let tabValue = tab
-						  data[name] = value
-						  data[tabName] = tabValue
-						  obj.attributeJson = JSON.stringify(data)
-						  this.stockList.push(obj)
-					  })
-					  
-				  }
-			  },
-			  //调起上传图片
-			  srcFileImage() {
-			  	let _that = this
-				let imageUrl = ''
-			  	uni.chooseImage({
-			  		count: 10, //默认9
-			  		sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-			  		sourceType: ['album'], //从相册选择
-			  		success: function(res) {
-			  			console.log(res)
-			  			const JSESSIONID = utils.uuid()
-			  			uni.uploadFile({
-			  				url: 'http://uat.xingoil.com/adminapi/oil-oss/obejct/uploadFile',
-			  				filePath: res.tempFilePaths[0],
-			  				formData: {
-			  					ossKey: 'xingyou',
-			  					pathKey: 'publicxingyou',
-			  					encrypt: 'PUBLIC',
-			  				},
-			  				name: 'file',
-			  				header: {
-			  					"Content-Type": "multipart/form-data",
-			  					"Authorization": uni.getStorageSync('Authorization'),
-			  					'dataSources': 'MP',
-			  					"imei": uni.getStorageSync('unionid'),
-			  					"openId": uni.getStorageSync('openid'),
-			  					'JSESSIONID': JSESSIONID,
-			  					'token': utils.md5Salt(JSESSIONID)
-			  				},
-			  				success(e) {
-			  					let obj = JSON.parse(e.data),
-			  						imageUrl = obj.data.publicUrl
-									_that.getImage(imageUrl)
-			  				},
-							fail(err) {
-							}
-			  			})
-			  		},fail() {
-			  			console.log('相机调用失败')
-			  		}
-			  	})
-			  },
-			  getImage(imageUrl){
-				  if(JSON.stringify(this.productDate.images) == '[]'){
-				  	this.productDate.images.push({
-				  		url:imageUrl,
-				  		mainMark:1
-				  	})
-				  }else{
-				  	this.productDate.images.push({
-				  		url:imageUrl,
-				  		mainMark:''
-				  	})
-				  }
-			  },
-			  setMainImage(index){
-				  this.productDate.images.forEach((tab,i)=>{
-					  if(i == index){
-						  tab.mainMark = 1
-					  }else{
-						  tab.mainMark = ''
-					  }
-				  })
-			  },
-			  clearImage(index){
-				if(this.productDate.images[index].mainMark == 1){
-					this.productDate.images.splice(index,1)
-					this.productDate.images[0].mainMark = 1
-				}else{
-					this.productDate.images.splice(index,1)
+				})
+			},
+			attributesData() {
+				this.bottonList = [{
+					marketPrice: '',
+					sellPrice: '',
+					stock: '',
+					integral: ''
+				}]
+				this.stockList = []
+				this.radioAttributes = ''
+				this.checkboxAttributes = []
+				if (this.productDate.attributesTypeId) {
+					this.attributesTypeList.forEach(tab => {
+						if (tab.value == this.productDate.attributesTypeId) {
+							this.attributesList = tab.attributesList
+							this.attributesList.forEach(tab => {
+								tab.attributesList = []
+								tab.attributeContent.split(',').forEach(item => {
+									tab.attributesList.push({
+										value: item,
+										text: item
+									})
+								})
+							})
+
+						}
+					})
+				} else {
+					this.attributesList = []
 				}
-			  },
-			  closed(){
-				  uni.navigateTo({
-				  	url: '/pages/index/index'
-				  })
-			  },
-			  addCompleted(){
-				  if(this.radioItem[0].checked =true){
+
+			},
+			changeRadio(item, index) {
+				if (JSON.stringify(this.checkedList) == '[]') {
+					this.checkedList.push({
+						attributeId: item.id,
+						checked: this.radioAttributes
+					})
+				} else {
+					this.checkedList[index].checked = this.radioAttributes
+				}
+				this.stockCheck()
+			},
+			changeCheckBox(item, index) {
+				if (this.checkedList.length < index + 1) {
+					this.checkedList.push({
+						attributeId: item.id,
+						checked: this.radioAttributes
+					})
+				} else {
+					let checked = []
+					this.checkboxAttributes.forEach(tab => {
+						checked.push(tab)
+					})
+					this.checkedList[index].checked = checked.join(',')
+					this.checkedList.checked
+				}
+				this.stockCheck()
+			},
+			stockCheck() {
+				this.stockList = []
+				let obj = {
+					marketPrice: '',
+					sellPrice: '',
+					stock: '',
+					integral: ''
+				}
+				if (this.attributesList.length == 1) {
+					let data = {}
+					let name = this.attributesList[0].attributeName
+					let value = this.radioAttributes
+					data[name] = value
+					obj.attributeJson = JSON.stringify(data)
+					this.stockList.push(obj)
+				} else {
+					this.attributesList.forEach((item, ind) => {
+						if (ind != 0) {
+							this.checkboxAttributes.forEach((tab, index) => {
+								let data = {}
+								let tabName = this.attributesList[ind].attributeName
+								let tabValue = tab
+								data[tabName] = tabValue
+								obj.attributeJson = JSON.stringify(data)
+								let stockObj = JSON.parse(JSON.stringify(obj))
+								this.stockList.push(stockObj)
+							})
+						}
+					})
+
+
+				}
+			},
+			deleteCheckAll(i) {
+				if (this.checkboxAttributes.length > 1) {
+					this.checkboxAttributes.splice(i, 1)
+				} else {
+					this.checkboxAttributes.splice(i, 1)
+					this.radioAttributes = ''
+				}
+				this.stockList.splice(i, 1)
+			},
+			deleteRadio() {
+				this.radioAttributes = ''
+			},
+			changeChecked(item) {
+				item.checked = !item.checked
+			},
+			addStockList() {
+				this.stockList.forEach(tab => {
+					tab.marketPrice = this.bottonList[0].marketPrice
+					tab.sellPrice = this.bottonList[0].sellPrice
+					tab.stock = this.bottonList[0].stock
+					tab.integral = this.bottonList[0].integral
+				})
+			},
+			//调起上传图片
+			srcFileImage() {
+				let _that = this
+				let imageUrl = ''
+				uni.chooseImage({
+					count: 10, //默认9
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ['album'], //从相册选择
+					success: function(res) {
+						const JSESSIONID = utils.uuid()
+						uni.uploadFile({
+							url: 'http://uat.xingoil.com/adminapi/oil-oss/obejct/uploadFile',
+							filePath: res.tempFilePaths[0],
+							formData: {
+								ossKey: 'xingyou',
+								pathKey: 'publicxingyou',
+								encrypt: 'PUBLIC',
+							},
+							name: 'file',
+							header: {
+								"Content-Type": "multipart/form-data",
+								"Authorization": uni.getStorageSync('Authorization'),
+								'dataSources': 'MP',
+								"imei": uni.getStorageSync('unionid'),
+								"openId": uni.getStorageSync('openid'),
+								'JSESSIONID': JSESSIONID,
+								'token': utils.md5Salt(JSESSIONID)
+							},
+							success(e) {
+								let obj = JSON.parse(e.data),
+									imageUrl = obj.data.publicUrl
+								_that.getImage(imageUrl)
+							},
+							fail(err) {}
+						})
+					},
+					fail() {
+						console.log('相机调用失败')
+					}
+				})
+			},
+			getImage(imageUrl) {
+				if (JSON.stringify(this.productDate.images) == '[]') {
+					this.productDate.images.push({
+						url: imageUrl,
+						mainMark: 1
+					})
+				} else {
+					this.productDate.images.push({
+						url: imageUrl,
+						mainMark: ''
+					})
+				}
+			},
+			setMainImage(items, index) {
+				let obj = items
+				obj.mainMark = 1
+				this.productDate.images.splice(index, 1)
+				this.productDate.images.forEach((tab, i) => {
+					tab.mainMark = ''
+				})
+
+				this.productDate.images.unshift(obj)
+			},
+			clearImage(index) {
+				if (this.productDate.images[index].mainMark == 1) {
+					this.productDate.images.splice(index, 1)
+					this.productDate.images[0].mainMark = 1
+				} else {
+					this.productDate.images.splice(index, 1)
+				}
+			},
+			closed() {
+				uni.navigateTo({
+					url: '/pages/index/index'
+				})
+			},
+			addCompleted() {
+				if (this.radioItem[0].checked = true) {
 					this.productDate.newMark == '1'
-				  }else{
-					  this.productDate.newMark == '2'
-				  }
-				  if(this.radioItem[1].checked =true){
-					  this.productDate.recommend == '1'
-				  }else{
-					  this.productDate.recommend == '2'
-				  }
-				  this.productDate.checkedList = this.checkedList
-				  this.productDate.stockList  =  this.stockList
-				  serve.saveProduct(this.productDate).then(res=>{
-					  console.log(res)
-					  uni.showToast({
-					  	title: res.msg,
-					  	icon: 'none'
-					  })
-					  this.closed()
-				  })
-			  }
+				} else {
+					this.productDate.newMark == '2'
+				}
+				if (this.radioItem[1].checked = true) {
+					this.productDate.recommend == '1'
+				} else {
+					this.productDate.recommend == '2'
+				}
+				this.productDate.checkedList = this.checkedList
+				this.productDate.stockList = this.stockList
+				serve.saveProduct(this.productDate).then(res => {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					this.closed()
+				})
+			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	
-		.fadeBox{
-		    width: 100%;
-		    margin-bottom: 20rpx;
-		}
-		#chooseType{
+	.fadeBox {
+		width: 100%;
+		margin-bottom: 20rpx;
+	}
+
+	#chooseType {
 		padding: 30rpx;
-		
-		mulpicker{
+
+		mulpicker {
 			height: 72rpx;
 			line-height: 72rpx;
 		}
-		/deep/ .uni-forms{
+
+		/deep/ .uni-forms {
 			width: 100%;
 		}
-		.content{
+
+		.content {
 			font-size: 28rpx;
 			font-weight: bold;
 		}
-		
-		
-		/deep/ .uni-forms-item{
+
+
+		/deep/ .uni-forms-item {
 			width: 100%;
 		}
-		
-		/deep/ .uni-forms-item__label{
+
+		/deep/ .uni-forms-item__label {
 			color: #333 !important;
 			font-size: 30rpx;
 			font-weight: 700;
 		}
-		/deep/ .uni-forms-item__content{
+
+		/deep/ .uni-forms-item__content {
 			width: 100%;
-			input{
+
+			input {
 				height: 72rpx;
 				line-height: 72rpx;
 			}
 		}
-		
-		switch{
+
+		switch {
 			margin-top: 9rpx;
 		}
-		switch::before{
-			 content: '';
-		 }
-		 switch::after{
-			 content: '';
-		 }	
+
+		switch::before {
+			content: '';
 		}
-		#instruction{
-			padding: 30rpx;
-			
-			mulpicker{
+
+		switch::after {
+			content: '';
+		}
+	}
+
+	#instruction {
+		padding: 30rpx;
+
+		mulpicker {
+			height: 72rpx;
+			line-height: 72rpx;
+		}
+
+		/deep/ .uni-forms {
+			width: 100%;
+		}
+
+		/deep/ .uni-forms-item {
+			width: 100%;
+		}
+
+		/deep/ .uni-forms-item__label {
+			color: #333 !important;
+			font-size: 30rpx;
+			font-weight: 700;
+		}
+
+		/deep/ .uni-forms-item__content {
+			width: 100%;
+
+			input {
 				height: 72rpx;
 				line-height: 72rpx;
 			}
-			/deep/ .uni-forms{
-				width: 100%;
-			}
-			/deep/ .uni-forms-item{
-				width: 100%;
-			}
-			
-			/deep/ .uni-forms-item__label{
-				color: #333 !important;
-				font-size: 30rpx;
-				font-weight: 700;
-			}
-			/deep/ .uni-forms-item__content{
-				width: 100%;
-				input{
-					height: 72rpx;
-					line-height: 72rpx;
-				}
-			}
-			.content{
-				padding-bottom: 20rpx;
-				border-bottom: 1rpx solid #F6F6F6;
-			}
-			.tagButton{
-				display: inline-block;
-				width: 133rpx;
-				background: #f5f5f5;
-				color: #666666;
-				border-radius: 8rpx;
-				line-height: 58rpx;
-				text-align: center;
-				margin: 8rpx;
-			}
-			.checkedTag{
-				background-color: #2979ff;
-				color: #FFFFFF;
-			}
-			.redButton{
-				display: inline-block;
-				width: 84rpx;
+		}
+
+		.content {
+			padding-bottom: 20rpx;
+			border-bottom: 1rpx solid #F6F6F6;
+		}
+
+		.tagButton {
+			display: inline-block;
+			width: 133rpx;
+			background: #f5f5f5;
+			color: #666666;
+			border-radius: 8rpx;
+			line-height: 58rpx;
+			text-align: center;
+			margin: 8rpx;
+
+			input {
 				height: 58rpx;
-				background: red;
+			}
+		}
+
+		.checkedTag {
+			background-color: #2979ff;
+			color: #FFFFFF;
+		}
+
+		.redButton {
+			position: absolute;
+			right: -84rpx;
+			top: 10rpx;
+			display: inline-block;
+			width: 84rpx;
+			height: 58rpx;
+			background: red;
+			color: #fff;
+			border-radius: 10rpx;
+			line-height: 58rpx;
+			text-align: center;
+		}
+
+		.commodityImage {
+			display: inline-block;
+			max-width: calc(100%-150rpx);
+		}
+
+		.imageList {
+			display: inline-block;
+			width: 140rpx;
+			margin: 0 10rpx;
+		}
+
+		.imageBlack {
+			display: inline-block;
+			width: 140rpx;
+			height: 140rpx;
+			vertical-align: middle;
+			text-align: center;
+			position: relative;
+
+			>image {
+				width: 100%;
+				height: 100%;
+			}
+
+			.cameraText {
+				width: 140rpx;
+				height: 30rpx;
+				text-align: center;
+				line-height: 30rpx;
+				position: absolute;
+				background-color: #333;
+				opacity: 0.3;
+				color: #FFFFFF;
+				left: 0rpx;
+				top: 110rpx;
+			}
+
+			.cameraClear {
+				position: absolute;
+				left: 120rpx;
+				top: -10rpx;
+				z-index: 20;
+			}
+		}
+
+	}
+
+	.checkbox-con {
+		margin-top: 40rpx;
+		text-align: center;
+		position: relative;
+	}
+
+	.checkbox {
+		width: 180rpx;
+		height: 76rpx;
+		line-height: 76rpx;
+		font-size: 30rpx;
+		color: #666666;
+		border: 1rpx solid #B6B6B6;
+		border-radius: 5rpx;
+		display: inline-block;
+		margin: 0 10rpx 20rpx 0;
+		position: absolute;
+		top: 50rpx;
+
+		&:nth-of-type(1) {
+			left: -190rpx;
+		}
+
+		&:nth-of-type(2) {
+			left: 50rpx;
+		}
+	}
+
+	.checked {
+		color: #FFFFFF;
+		background: #FE0606;
+		border: 1rpx solid #FE0606;
+	}
+
+	.checkbox checkbox {
+		display: none
+	}
+
+
+
+
+	.buttons {
+		width: 100%;
+		display: flex;
+		justify-content: space-evenly;
+		margin-top: 180rpx;
+
+		>view {
+			width: 250rpx;
+			height: 76rpx;
+			text-align: center;
+			line-height: 76rpx;
+			border-radius: 10rpx;
+			font-size: 28rpx;
+
+			&:nth-of-type(1) {
+				background: #FFFFFF;
+				border: 1rpx solid #B6B6B6;
+				color: #333;
+			}
+
+			&:nth-of-type(2) {
+				background: #FE0505;
 				color: #fff;
-				border-radius: 10rpx;
-				line-height: 58rpx;
-				text-align: center;
-			}
-			.commodityImage{
-				display: inline-block;
-				max-width: calc(100%-150rpx);
-			}
-			.imageList{
-				display: inline-block;
-				width: 140rpx;
-				margin: 0 10rpx;
-			}
-			.imageBlack{
-				display: inline-block;
-				width: 140rpx;
-				height: 140rpx;
-				vertical-align: middle;
-				text-align: center;
-				position: relative;
-				>image{
-					width: 100%;
-					height: 100%;
-				}
-				.cameraText{
-					width: 140rpx;
-					height: 30rpx;
-					text-align: center;
-					line-height: 30rpx;
-					position: absolute;
-					background-color: #333;
-					opacity: 0.3;
-					color: #FFFFFF;
-					left: 0rpx;
-					top: 110rpx;
-				}
-				.cameraClear{
-					position: absolute;
-					left: 120rpx;
-					top: -10rpx;
-					z-index: 20;
-				}
-			}
-			
-		}
-		
-		.checkbox-con{
-		 margin-top: 40rpx;
-		 text-align: center;
-		 position: relative;
-		}
-		.checkbox{
-		 width: 180rpx;
-		 height: 76rpx;
-		 line-height: 76rpx;
-		 font-size: 30rpx;
-		 color: #666666;
-		 border: 1rpx solid #B6B6B6;
-		 border-radius: 5rpx;
-		 display: inline-block;
-		 margin: 0 10rpx 20rpx 0;
-		 position: absolute;
-		 top: 50rpx;
-		 &:nth-of-type(1){
-			 left: -190rpx;
-		 }
-		 &:nth-of-type(2){
-			 left: 50rpx;
-		 }
-		}
-		
-		.checked{
-		 color: #FFFFFF;
-		 background: #FE0606;
-		 border: 1rpx solid #FE0606;
-		}
-		.checkbox checkbox{
-		 display: none
-		}
-		 
-		 
-		 
-		 
-		.buttons {
-			width: 100%;
-			display: flex;
-			justify-content: space-evenly;
-			margin-top: 180rpx;
-		
-			>view {
-				width: 250rpx;
-				height: 76rpx;
-				text-align: center;
-				line-height: 76rpx;
-				border-radius: 10rpx;
-				font-size: 28rpx;
-		
-				&:nth-of-type(1) {
-					background: #FFFFFF;
-					border: 1rpx solid #B6B6B6;
-					color: #333;
-				}
-		
-				&:nth-of-type(2) {
-					background: #FE0505;
-					color: #fff;
-				}
 			}
 		}
-		.show{
-		    display: flex;
-		    flex-wrap: wrap;
-		}
-		.hidden{
-		    display: none;
-		}
-</style>
+	}
+
+	.show {
+		display: flex;
+		flex-wrap: wrap;
+	}
+
+	.hidden {
+		display: none;
+	}
+</style>
\ No newline at end of file
diff --git a/packageIntegral/productList/index.vue b/packageIntegral/productList/index.vue
index 6a7a5dd..a1b0ed8 100644
--- a/packageIntegral/productList/index.vue
+++ b/packageIntegral/productList/index.vue
@@ -10,16 +10,15 @@
 				@click="selectOptions(index)">{{item.text}}<text>({{item.count}})</text></view>
 		</view>
 		<view class="search">
-			<uni-easyinput prefixIcon="search" borderColor="#DCDFE6" v-model="paramter.params.productName" placeholder="请输入商品名称"
-				@confirm="search"  @clear="search" />
+			<uni-easyinput prefixIcon="search" borderColor="#DCDFE6" v-model="paramter.params.productName"
+				placeholder="请输入商品名称" @confirm="search" @clear="search" />
 		</view>
 
 
 		<scroll-view v-if="dataList.length" class="list" :scroll-y="true" @scrolltolower="lower">
 			<view class="item" v-for="item,index in dataList" :key="index">
 				<view class="header">
-					<view class="identifying"
-					 :style="{background:identifying[item.productStatus].background,
+					<view class="identifying" :style="{background:identifying[item.productStatus].background,
 					 opacity:identifying[item.productStatus].opacity}">{{item.productStatus =='1'?'已上架':'未上架'}}</view>
 				</view>
 				<view class="introduce">
@@ -29,7 +28,8 @@
 					<view>库存：{{item.totalStock}}</view>
 				</view>
 				<view class="examine" @click="examineDetail(item)"
-				 :style="{background:statusEnum[item.auditStatus].color}" >{{statusEnum[item.auditStatus].value}}</view>
+					:style="{background:statusEnum[item.auditStatus].color}">{{statusEnum[item.auditStatus].value}}
+				</view>
 				<view class="footer">
 					<view class="button" @click="orderDelete">删除</view>
 					<view class="button" @click="toEditOrder(item)">编辑</view>
@@ -128,7 +128,7 @@
 					count: 0,
 					value: ''
 				}],
-				identifying:{
+				identifying: {
 					1: {
 						background: '#F83D3D',
 						opacity: 1,
@@ -154,8 +154,8 @@
 						value: "已驳回"
 					},
 				},
-				examineDetailList:[],
-				productData:{}
+				examineDetailList: [],
+				productData: {}
 			}
 		},
 
@@ -167,17 +167,17 @@
 		methods: {
 			selectOptions(index) {
 				this.currentIndex = index
-				console.log(index,'index')
-				if(index == 0){
-					this.paramter.params ={}
-				}else if(index ==1){
-					this.paramter.params ={}
+				console.log(index, 'index')
+				if (index == 0) {
+					this.paramter.params = {}
+				} else if (index == 1) {
+					this.paramter.params = {}
 					this.paramter.params.productStatus = 1
-				}else if(index ==2){
-					this.paramter.params ={}
+				} else if (index == 2) {
+					this.paramter.params = {}
 					this.paramter.params.productStatus = 2
-				}else if(index ==3){
-					this.paramter.params ={}
+				} else if (index == 3) {
+					this.paramter.params = {}
 					this.paramter.params.auditStatus = 1
 				}
 				this.productByPage()
@@ -197,7 +197,7 @@
 			// 		url: `../orderDetails/index?orderId=${item.id}`
 			// 	})
 			// },
-			getTopInfo(){
+			getTopInfo() {
 				serve.getTopInfo(this.paramter).then(res => {
 					if (res.code === 20000) {
 						this.optionsList[0].count = res.data.count
@@ -233,16 +233,18 @@
 				this.paramter.currentPage += 1
 				this.productByPage()
 			},
-			examineDetail(item){
-				serve.productAuditHistory({id:item.id}).then(res=>{
+			examineDetail(item) {
+				serve.productAuditHistory({
+					id: item.id
+				}).then(res => {
 					this.examineDetailList = res.data
 				})
 				this.$refs.detail.open('center')
 			},
-			orderDelete(){
+			orderDelete() {
 				this.$refs.delete.open('center')
 			},
-			toEditOrder(item){
+			toEditOrder(item) {
 				uni.navigateTo({
 					url: `../productUpdate/index?id=${item.id}`
 				})
@@ -252,16 +254,16 @@
 				this.productData = item
 				this.$refs.popup.open('center')
 			},
-			submitProduct(){
+			submitProduct() {
 				let data = {}
 				data.id = this.productData.id
-				if(this.productData.productStatus ==1){
+				if (this.productData.productStatus == 1) {
 					data.productStatus = 2
-				}else if(this.productData.productStatus ==2){
+				} else if (this.productData.productStatus == 2) {
 					data.productStatus = 1
 				}
 
-				serve.productStatus(data).then(res=>{
+				serve.productStatus(data).then(res => {
 					uni.showToast({
 						title: res.msg,
 						icon: 'none'
@@ -297,6 +299,7 @@
 			background: #FFF;
 
 		}
+
 		>.options-frame {
 			display: flex;
 			justify-content: space-between;
@@ -354,7 +357,7 @@
 					color: #666;
 					border-top: 1rpx solid #D7D7D7;
 
-					.identifying{
+					.identifying {
 						width: 120rpx;
 						height: 60rpx;
 						line-height: 60rpx;
@@ -404,7 +407,8 @@
 						}
 					}
 				}
-				.examine{
+
+				.examine {
 					width: 120rpx;
 					height: 45rpx;
 					color: #FFF;
@@ -438,14 +442,16 @@
 						border-radius: 10rpx;
 					}
 
-					>.button{
-						&:nth-of-type(1){
+					>.button {
+						&:nth-of-type(1) {
 							right: 360rpx;
 						}
-						&:nth-of-type(2){
+
+						&:nth-of-type(2) {
 							right: 200rpx;
 						}
-						&:nth-of-type(3){
+
+						&:nth-of-type(3) {
 							right: 40rpx;
 						}
 
@@ -467,30 +473,35 @@
 				color: #000;
 				margin-bottom: 20rpx;
 			}
-			>uni-icons{
+
+			>uni-icons {
 				position: absolute;
 				top: 30rpx;
 				right: 30rpx;
 			}
-			>.item{
+
+			>.item {
 				display: flex;
 				justify-content: space-evenly;
 				overflow-y: hidden;
 				font-size: 22rpx;
 				color: #666;
 				padding: 10rpx;
-				view{
+
+				view {
 					width: 240rpx;
 					line-height: 46rpx;
 				}
-				>.status{
+
+				>.status {
 					width: 160rpx;
-					>view{
+
+					>view {
 						width: 160rpx;
 					}
 				}
 
-				.header{
+				.header {
 					font-size: 32rpx;
 					color: #000;
 				}
@@ -574,4 +585,4 @@
 		}
 
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/packageIntegral/productUpdate/index.vue b/packageIntegral/productUpdate/index.vue
index 0f9f715..4b5748b 100644
--- a/packageIntegral/productUpdate/index.vue
+++ b/packageIntegral/productUpdate/index.vue
@@ -2,147 +2,156 @@
 	<view class="container">
 		<cu-custom class="main-totextbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
 			<block slot="backText">返回</block>
-			<block slot="content">新增商品</block>
+			<block slot="content">编辑商品</block>
 		</cu-custom>
-    <view id="chooseType" :class="currentBoxId == 'chooseType' ? 'show' : 'hidden'">
-		<uni-forms ref="productForm" :modelValue="productDate" :rules="rules" label-width="200rpx">
-					<uni-forms-item label="商品分类:" name="demandRegion">
-						<mulpicker
-						        v-model="productDate.demandRegion"
-						        :list="productList"
-						    rangekey="categoryName"
-						    code="id"
-						    pidkey="id"
-						    childkey="classificationTwoList"
-						    :emitPath="true"
-						    :level="2"
-						    :placeholder="'选择商品分类'"
-						/>
-						<uni-icons color="#666666" type="right" size="22" style="position: absolute;right: 0;top: 10rpx;"></uni-icons>
-					</uni-forms-item>
-					<uni-forms-item label="商品名称:" name="productName">
-						<input type="text" v-model="productDate.productName" placeholder="请输入商品名称" />
-					</uni-forms-item>
-					<uni-forms-item label="关键词:" name="keyword">
-						<input type="text" v-model="productDate.keyword" placeholder="请输入关键词(空格分隔)" />
-					</uni-forms-item>
-					<uni-forms-item label="商品品牌:" name="brandId">
-						<!-- <input type="text" v-model="productDate.brandId" placeholder="请输入商品品牌" /> -->
-						  <uni-data-select
-						        v-model="productDate.brandId"
-						        :localdata="brandIdList"
-								placeholder="请选择商品品牌"
-						      ></uni-data-select>
-					</uni-forms-item>
-					<uni-forms-item label="商品售价:" name="price">
-						<input type="text" v-model="productDate.price" placeholder="请输入商品售价" />
-					</uni-forms-item>
-					<uni-forms-item label="商品上架:" name="productStatus">
-						<switch v-model="productDate.productStatus" :checked="productDate.productStatus=='1'" color="#FE0606" @change="switchChange" style="transform:scale(0.7)" />
-					</uni-forms-item>
-					<uni-forms-item label="商品推荐:" name="age">
-						<view class='checkbox-con'>
-						 <radio-group>
-						  <label :class="item.checked?'checkbox checked':'checkbox'" @click="checkbox(index)" v-for="(item, index) in radioItem" :key="item.value">
-						  <checkbox :value="item.value" :checked="item.checked"/>{{item.name}}
-						  </label>
-						 </radio-group>
-						 </view>
-					</uni-forms-item>
-				</uni-forms>
+		<view id="chooseType" :class="currentBoxId == 'chooseType' ? 'show' : 'hidden'">
+			<uni-forms ref="productForm" :modelValue="productDate" :rules="rules" label-width="200rpx">
+				<uni-forms-item label="商品分类:" name="demandRegion">
+					<mulpicker v-model="productDate.demandRegion" :list="productList" rangekey="categoryName" code="id"
+						pidkey="id" childkey="classificationTwoList" :emitPath="true" :level="2"
+						:placeholder="'选择商品分类'" />
+					<uni-icons color="#666666" type="right" size="22"
+						style="position: absolute;right: 0;top: 10rpx;"></uni-icons>
+				</uni-forms-item>
+				<uni-forms-item label="商品名称:" name="productName">
+					<input type="text" v-model="productDate.productName" placeholder="请输入商品名称" />
+				</uni-forms-item>
+				<uni-forms-item label="关键词:" name="keyword">
+					<input type="text" v-model="productDate.keyword" placeholder="请输入关键词(空格分隔)" />
+				</uni-forms-item>
+				<uni-forms-item label="商品品牌:" name="brandId">
+					<!-- <input type="text" v-model="productDate.brandId" placeholder="请输入商品品牌" /> -->
+					<uni-data-select v-model="productDate.brandId" :localdata="brandIdList"
+						placeholder="请选择商品品牌"></uni-data-select>
+				</uni-forms-item>
+				<uni-forms-item label="商品售价:" name="price">
+					<input type="text" v-model="productDate.price" placeholder="请输入商品售价" />
+				</uni-forms-item>
+				<uni-forms-item label="商品上架:" name="productStatus">
+					<switch v-model="productDate.productStatus" :checked="productDate.productStatus=='1'"
+						color="#FE0606" @change="switchChange" style="transform:scale(0.7)" />
+				</uni-forms-item>
+				<uni-forms-item label="商品推荐:" name="age">
+					<view class='checkbox-con'>
+						<radio-group>
+							<label :class="item.checked?'checkbox checked':'checkbox'" @click="checkbox(index)"
+								v-for="(item, index) in radioItem" :key="item.value">
+								<checkbox :value="item.value" :checked="item.checked" />{{item.name}}
+							</label>
+						</radio-group>
+					</view>
+				</uni-forms-item>
+			</uni-forms>
 			<view class="buttons">
 				<view @click="closed">取消</view>
-			<view id="next" @click="changeBox">下一步</view>
+				<view id="next" @click="changeBox">下一步</view>
 			</view>
 		</view>
 
 
-    <view id="instruction" :class="currentBoxId == 'instruction' ? 'show' : 'hidden'">
-		<uni-forms :modelValue="productDate" label-width="200rpx">
-					<uni-forms-item label="属性类别:" >
-						  <uni-data-select
-						        v-model="productDate.attributesTypeId"
-						        :localdata="attributesTypeList"
-								placeholder="请选择商品品牌"
-								@change="attributesData"
-						      ></uni-data-select>
-					</uni-forms-item>
+		<view id="instruction" :class="currentBoxId == 'instruction' ? 'show' : 'hidden'">
+			<uni-forms :modelValue="productDate" label-width="200rpx">
+				<uni-forms-item label="属性类别:">
+					<uni-data-select v-model="productDate.attributesTypeId" :localdata="attributesTypeList"
+						placeholder="请选择商品品牌" @change="attributesData"></uni-data-select>
+				</uni-forms-item>
 				<view class="content" v-show="productDate.attributesTypeId">
 					<view style="margin: 10rpx 0;">商品类型：</view>
 					<view>
 						<uni-section type="line">
-									<view class="uni-px-5" v-for="(item,index) in attributesList">
-										<view style="display: inline-block;">{{item.attributeName}}：</view>
-										<view  style="display: inline-block;">
-                      <uni-data-checkbox v-if="index==0" mode="tag" @change="changeRadio(item,index)" v-model="radioAttributes" :localdata="item.attributesList"></uni-data-checkbox>
-                      <uni-data-checkbox v-else-if="index!=0" mode="tag" @change="changeCheckBox(item,index)" multiple v-model="checkboxAttributes" :localdata="item.attributesList"></uni-data-checkbox>
-										</view>
+							<view class="uni-px-5" v-for="(item,index) in attributesList">
+								<view style="display: inline-block;">{{item.attributeName}}：</view>
+								<view style="display: inline-block;">
+									<uni-data-checkbox v-if="index==0" mode="tag" @change="changeRadio(item,index)"
+										v-model="radioAttributes" :localdata="item.attributesList"></uni-data-checkbox>
+									<uni-data-checkbox v-else-if="index!=0" mode="tag"
+										@change="changeCheckBox(item,index)" multiple v-model="checkboxAttributes"
+										:localdata="item.attributesList"></uni-data-checkbox>
+								</view>
 
-									</view>
-								</uni-section>
+							</view>
+						</uni-section>
 					</view>
 				</view>
 				<view style="padding-bottom: 20rpx;border-bottom: 1rpx solid #f6f6f6;">
 					<view>批量填充：<text style="color: #999999;margin: 10rpx 0;">批量填充填入信息后，可以批量将内容填写到SKU 信息里</text></view>
-					<view class="tagButton" @tap="changeChecked(item)" v-for="item in bottonList">{{item.label}}</view>
-					<view class="redButton" @tap="addStockList">确定</view>
+					<view style="display: inline-block;position: relative;" v-for="item in bottonList">
+						<view class="tagButton">
+							<input type="text" v-model="item.marketPrice" placeholder="市场价格" />
+						</view>
+						<view class="tagButton">
+							<input type="text" v-model="item.sellPrice" placeholder="销售价格" />
+						</view>
+						<view class="tagButton">
+							<input type="text" v-model="item.stock" placeholder="库存数量" />
+						</view>
+						<view class="tagButton">
+							<input type="text" v-model="item.integral" placeholder="积分价值" />
+						</view>
+						<view class="redButton" @tap="addStockList">确定</view>
+					</view>
+
+
 				</view>
-				<view style="padding: 20rpx 0;;border-bottom: 1rpx solid #f6f6f6;" v-for="(items,index) in stockList">
+				<view style="padding: 20rpx 0;;border-bottom: 1rpx solid #f6f6f6;" v-for="(tab,index) in stockList"
+					:key="index">
 					<view style="margin: 10rpx 0;">
 						<text style="color: red;">*</text>
 						<text>规格：</text>
-						<text v-if="index==0">{{radioAttributes}}</text>
-						<text v-if="index!=0">{{radioAttributes}}+{{checkboxAttributes[index]}}</text>
+						<text v-if="checkboxAttributes.length==0">{{radioAttributes}}</text>
+						<text
+							v-if="checkboxAttributes.length>0">{{radioAttributes}}+{{checkboxAttributes[index]}}</text>
 					</view>
 					<view class="tagButton">
-						<input type="text" v-model="items.marketPrice" placeholder="市场价格" />
+						<input type="text" v-model="tab.marketPrice" placeholder="市场价格" />
 					</view>
 					<view class="tagButton">
-						<input type="text" v-model="items.sellPrice" placeholder="销售价格" />
+						<input type="text" v-model="tab.sellPrice" placeholder="销售价格" />
 					</view>
 					<view class="tagButton">
-						<input type="text" v-model="items.stock" placeholder="库存数量" />
+						<input type="text" v-model="tab.stock" placeholder="库存数量" />
 					</view>
 					<view class="tagButton">
-						<input type="text" v-model="items.integral" placeholder="积分价值" />
+						<input type="text" v-model="tab.integral" placeholder="积分价值" />
 					</view>
-					<view style="display: inline-block;vertical-align: top;margin-top: 10rpx;" @click="deleteCheckAll(index)">删除</view>
+					<view style="display: inline-block;vertical-align: top;margin-top: 10rpx;"
+						@click="deleteCheckAll(index)">删除</view>
 				</view>
 				<view>
 					<view style="margin: 10rpx 0;">
 						<text style="color: red;">*</text>
 						商品图片：
 						<text style="color: #999999;">最多可上传10张图片</text>
+					</view>
+					<view class="imageList" v-for="(items,index) in productDate.images">
+						<view class="imageBlack" v-if="items.mainMark==1">
+							<image :src="items.url"></image>
+							<view class="cameraText">商品主图</view>
+							<uni-icons class="cameraClear" type="clear" size="20" @tap="clearImage(index)"></uni-icons>
 						</view>
-							<view class="imageList" v-for="(items,index) in productDate.images">
-							<view class="imageBlack" v-if="items.mainMark==1">
-								<image :src="items.url"></image>
-								<view class="cameraText">商品主图</view>
-								<uni-icons class="cameraClear" type="clear" size="20" @tap="clearImage(index)"></uni-icons>
-							</view>
-							<view class="imageBlack" v-else-if="items.mainMark!=1">
-								<image :src="items.url"></image>
-								<view class="cameraText" @click="setMainImage(index)">设为主图</view>
-								<uni-icons class="cameraClear" type="clear" size="20" @tap="clearImage(index)"></uni-icons>
-							</view>
+						<view class="imageBlack" v-else-if="items.mainMark!=1">
+							<image :src="items.url"></image>
+							<view class="cameraText" @click="setMainImage(items,index)">设为主图</view>
+							<uni-icons class="cameraClear" type="clear" size="20" @tap="clearImage(index)"></uni-icons>
 						</view>
-						<view class="imageBlack" style="background-color: #fafafa;" @tap="srcFileImage">
-							<view style="margin-top: 46rpx;">
-								<uni-icons type="camera-filled" size="30"></uni-icons>
-							</view>
+					</view>
+					<view class="imageBlack" style="background-color: #fafafa;" @tap="srcFileImage">
+						<view style="margin-top: 46rpx;">
+							<uni-icons type="camera-filled" size="30"></uni-icons>
 						</view>
+					</view>
 
 				</view>
 				<!-- <view>
 					<view>详情图片：<text style="color: #999999;">最多可上传10张图片</text></view>
 					<view></view>
 				</view> -->
-				</uni-forms>
-		<view class="buttons">
-			<view id="previous"  @click="changeBox">上一步</view>
-			<view @click="addCompleted">完成</view>
+			</uni-forms>
+			<view class="buttons">
+				<view id="previous" @click="changeBox">上一步</view>
+				<view @click="addCompleted">完成</view>
+			</view>
 		</view>
-    </view>
 
 
 
@@ -155,102 +164,129 @@
 	import serve from '@/api/packageIntegral/productList.js'
 	import mulpicker from '@/packageIntegral/components/mulpicker.vue'
 	export default {
-	components: {
-		mulpicker
-	},
+		components: {
+			mulpicker
+		},
 		data() {
 			return {
 				currentBoxId: 'chooseType', //当前显示的view的id
 				isBoxShow: false,
-				productDate:{
-          productStatus:'1',
-					images:[]
+				productDate: {
+					productStatus: '1',
+					images: []
 				},
-				productList:[],
-				brandIdList:[],
-				radioItem:[{
-					  name: '新品',
-					  checked: true
-					 }, {
-					  name: '推荐',
-					  checked: false
-					 }],
-					 rules:{
-             demandRegion:{rules:[{required: true,errorMessage: '请选择商品分类'}]},
-						 productName:{rules:[{required: true,errorMessage: '请输入商品名称'}]},
-						 brandId:{rules:[{required: true,errorMessage: '请选择商品品牌'}]},
-						 price:{rules:[{required: true,errorMessage: '请输入商品售价'}]},
-					 },
-					 attributesTypeList:[],
-					 attributesList:[],
-					 bottonList:[
-					 	{label:'市场价格',value:'marketPrice',checked:false},
-					 	{label:'销售价格',value:'sellPrice',checked:false},
-					 	{label:'商品库存',value:'stock',checked:false},
-					 	{label:'兑换积分',value:'integral',checked:false}
-					 ],
-					 radioAttributes:'',
-					 checkboxAttributes:[],
-					 stockList:[],
-        checkedList:[]
+				productList: [],
+				brandIdList: [],
+				radioItem: [{
+					name: '新品',
+					checked: true
+				}, {
+					name: '推荐',
+					checked: false
+				}],
+				rules: {
+					demandRegion: {
+						rules: [{
+							required: true,
+							errorMessage: '请选择商品分类'
+						}]
+					},
+					productName: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入商品名称'
+						}]
+					},
+					brandId: {
+						rules: [{
+							required: true,
+							errorMessage: '请选择商品品牌'
+						}]
+					},
+					price: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入商品售价'
+						}]
+					},
+				},
+				attributesTypeList: [],
+				attributesList: [],
+				bottonList: [{
+					marketPrice: '',
+					sellPrice: '',
+					stock: '',
+					integral: ''
+				}],
+				radioAttributes: '',
+				checkboxAttributes: [],
+				stockList: [],
+				checkedList: []
 			}
 		},
 
 		onLoad(options) {
-			console.log(options,'options')
 			this.getEdit(options)
 			this.classfication()
 			this.getProductBrands()
 			this.getAttributesType()
 		},
-		watch:{
-			'productDate.demandRegion'(val){
-				if(val){
+		watch: {
+			'productDate.demandRegion'(val) {
+				if (val) {
 					this.productDate.categoryOneId = val.split(',')[0]
 					this.productDate.categoryTwoId = val.split(',')[1]
 				}
 			},
-      'productDate.attributesTypeId'(val){
-        if(!val){
-          this.stockList = []
-        }
-      }
+			'productDate.attributesTypeId'(val) {
+				if (!val) {
+					this.stockList = []
+				}
+			}
 		},
 		methods: {
-			getEdit(options){
-				serve.getEdit(options.id).then(res=>{
-					if(res.code === 20000&&res.data!=null){
+			getEdit(options) {
+				serve.getEdit(options.id).then(res => {
+					if (res.code === 20000 && res.data != null) {
 						this.productDate = res.data
-						this.productDate.demandRegion = res.data.categoryOneId+','+res.data.categoryTwoId
-						if(this.productDate.newMark == '1'){
-							this.radioItem[0].checked =true
-						}else{
-							this.radioItem[0].checked =false
+						this.productDate.demandRegion = res.data.categoryOneId + ',' + res.data.categoryTwoId
+						if (this.productDate.newMark == '1') {
+							this.radioItem[0].checked = true
+						} else {
+							this.radioItem[0].checked = false
 						}
-						if(this.productDate.recommend == '1'){
-							this.radioItem[1].checked =true
-						}else{
-							this.radioItem[1].checked =false
+						if (this.productDate.recommend == '1') {
+							this.radioItem[1].checked = true
+						} else {
+							this.radioItem[1].checked = false
 						}
-						this.attributesTypeList.forEach(tab=>{
-							if(tab.id = this.productDate.attributesTypeId){
+						this.attributesTypeList.forEach(tab => {
+							if (tab.value == this.productDate.attributesTypeId) {
 								this.attributesList = tab.attributesList
-								this.attributesList.forEach(tab=>{
+								this.attributesList.forEach(tab => {
 									tab.attributesList = []
-									tab.attributeContent.split(',').forEach(item=>{
-										tab.attributesList.push({value:item,text:item})
+									tab.attributeContent.split(',').forEach(item => {
+										tab.attributesList.push({
+											value: item,
+											text: item
+										})
 									})
 								})
 							}
 						})
 						this.checkedList = this.productDate.checkedList
-						if(this.productDate.checkedList.length==1){
+						if (this.productDate.checkedList.length == 1) {
 							this.radioAttributes = this.productDate.checkedList[0].checked
-						}else{
+						} else {
 							this.checkboxAttributes = []
-							this.productDate.checkedList.forEach((tab,index)=>{
-								if(index!=0){
-									this.checkboxAttributes.push(tab.checked)
+							this.productDate.checkedList.forEach((tab, index) => {
+								if (index == 0) {
+									this.radioAttributes = this.productDate.checkedList[0].checked
+								} else {
+									tab.checked.split(',').forEach(item => {
+										this.checkboxAttributes.push(item)
+									})
+
 								}
 							})
 						}
@@ -258,498 +294,561 @@
 
 
 					}
-					console.log(res.data)
 				})
 			},
-			switchChange(e){
-				if(e.detail.value == true){
+			switchChange(e) {
+				if (e.detail.value == true) {
 					this.productDate.productStatus = '1'
-				}else if(e.detail.value == false){
+				} else if (e.detail.value == false) {
 					this.productDate.productStatus = '2'
 				}
 			},
-			classfication(){
-				serve.classification().then(res=>{
+			classfication() {
+				serve.classification().then(res => {
 					this.productList = res.data
 				})
 			},
-			getProductBrands(){
+			getProductBrands() {
 				this.brandIdList = []
-				serve.getProductBrands().then(res=>{
-					console.log(res)
-					res.data.forEach(tab=>{
-						this.brandIdList.push({value:tab.id,text:tab.brandName})
+				serve.getProductBrands().then(res => {
+					res.data.forEach(tab => {
+						this.brandIdList.push({
+							value: tab.id,
+							text: tab.brandName
+						})
 					})
 
 				})
 			},
-			checkbox (e) {
-				 var index = e;//获取当前点击的下标
-				 var checkboxArr = this.radioItem;//选项集合
-				 // if (checkboxArr[index].checked) return;//如果点击的当前已选中则返回
-				 // checkboxArr.forEach(item => {
-				 //  item.checked = false
-				 // })
-				 if(checkboxArr[index].checked ==false){
-					 checkboxArr[index].checked = true; //改变当前选中的checked值
+			checkbox(e) {
+				var index = e; //获取当前点击的下标
+				var checkboxArr = this.radioItem; //选项集合
+				// if (checkboxArr[index].checked) return;//如果点击的当前已选中则返回
+				// checkboxArr.forEach(item => {
+				//  item.checked = false
+				// })
+				if (checkboxArr[index].checked == false) {
+					checkboxArr[index].checked = true; //改变当前选中的checked值
 
-				 }else {
-					 checkboxArr[index].checked = false; //改变当前选中的checked值
-				 }
-				 if(checkboxArr[0].checked ==true){
-					 this.productDate.newMark = 1
-				 }else{
-					 this.productDate.newMark = 2
-				 }
-				 if(checkboxArr[1].checked ==true){
-					 this.productDate.recommend = 1
-				 }else{
-					 this.productDate.recommend = 2
-				 }
+				} else {
+					checkboxArr[index].checked = false; //改变当前选中的checked值
+				}
+				if (checkboxArr[0].checked == true) {
+					this.productDate.newMark = 1
+				} else {
+					this.productDate.newMark = 2
+				}
+				if (checkboxArr[1].checked == true) {
+					this.productDate.recommend = 1
+				} else {
+					this.productDate.recommend = 2
+				}
 
-			 },
-			  changeBox(e){
-			    let currentFlag = e.currentTarget.id;
-          if(currentFlag == 'next'){
-            this.$refs.productForm.validate().then(res=>{
-              console.log('表单数据信息：', res);
-              switch(currentFlag){
-                case 'next':
-                  this.currentBoxId = 'instruction'
-                  break;
-                case 'previous':
-                  this.currentBoxId = 'chooseType'
-                  break;
-                default:
-                  this.currentBoxId = 'viewInstruction'
-                  break;
-              }
-              if(currentFlag == 'next'){
-                this.getAttributesType()
-              }
-            }).catch(err =>{
-              console.log('表单错误信息：', err);
-            })
-          }else{
-			  switch(currentFlag){
-			    case 'next':
-			        this.currentBoxId = 'instruction'
-			      break;
-			    case 'previous':
-			        this.currentBoxId = 'chooseType'
-			      break;
-			      default:
-			          this.currentBoxId = 'viewInstruction'
-			        break;
-			  }
-		  }
+			},
+			changeBox(e) {
+				let currentFlag = e.currentTarget.id;
+				if (currentFlag == 'next') {
+					this.$refs.productForm.validate().then(res => {
+						switch (currentFlag) {
+							case 'next':
+								this.currentBoxId = 'instruction'
+								break;
+							case 'previous':
+								this.currentBoxId = 'chooseType'
+								break;
+							default:
+								this.currentBoxId = 'viewInstruction'
+								break;
+						}
+						if (currentFlag == 'next') {
+							this.getAttributesType()
+						}
+					}).catch(err => {})
+				} else {
+					switch (currentFlag) {
+						case 'next':
+							this.currentBoxId = 'instruction'
+							break;
+						case 'previous':
+							this.currentBoxId = 'chooseType'
+							break;
+						default:
+							this.currentBoxId = 'viewInstruction'
+							break;
+					}
+				}
 
-			  },
-			  getAttributesType(){
-				  this.attributesTypeList = []
-				serve.getAttributesType().then(res=>{
-					res.data.forEach(tab=>{
+			},
+			getAttributesType() {
+				this.attributesTypeList = []
+				serve.getAttributesType().then(res => {
+					res.data.forEach(tab => {
 						this.attributesTypeList.push({
-							value:tab.id,
-							text:tab.name,
-							number:tab.number,
-							attributesList:tab.attributesList
-							})
+							value: tab.id,
+							text: tab.name,
+							number: tab.number,
+							attributesList: tab.attributesList
+						})
 					})
 				})
-			  },
-			  attributesData(){
-				  if(this.productDate.attributesTypeId){
-					this.attributesTypeList.forEach(tab=>{
-					  if(tab.id = this.productDate.attributesTypeId){
-						  this.attributesList = tab.attributesList
-						  this.attributesList.forEach(tab=>{
-							  tab.attributesList = []
-							  tab.attributeContent.split(',').forEach(item=>{
-								  tab.attributesList.push({value:item,text:item})
-							  })
-						  })
+			},
+			attributesData() {
+				this.bottonList = [{
+					marketPrice: '',
+					sellPrice: '',
+					stock: '',
+					integral: ''
+				}]
+				this.stockList = []
+				this.radioAttributes = ''
+				this.checkboxAttributes = []
+				if (this.productDate.attributesTypeId) {
+					this.attributesTypeList.forEach(tab => {
+						if (tab.value == this.productDate.attributesTypeId) {
+							this.attributesList = tab.attributesList
+							this.attributesList.forEach(tab => {
+								tab.attributesList = []
+								tab.attributeContent.split(',').forEach(item => {
+									tab.attributesList.push({
+										value: item,
+										text: item
+									})
+								})
+							})
 
-					  }
-				  })
-				  }else{
-					  this.attributesList = []
-				  }
-
-			  },
-      changeRadio(item,index){
-        if(JSON.stringify(this.checkedList) ==  '[]'){
-          this.checkedList.push({attributeId:item.id,checked:item.attributeName})
-        }else{
-          this.checkedList[index].checked = item.attributeName
-        }
-      },
-      changeCheckBox(item,index){
-        if(this.checkedList.length<index+1){
-          this.checkedList.push({attributeId:item.id,checked:item.attributeName})
-        }else{
-          let checked = []
-          this.checkboxAttributes.forEach(tab=>{
-            checked.push(tab)
-          })
-          this.checkedList[index].checked = checked.join(',')
-          this.checkedList.checked
-        }
-      },
-			  deleteCheckAll(i){
-				  if(this.checkboxAttributes.length>1){
-					  this.checkboxAttributes.splice(i,1)
-				  }else{
-					  this.checkboxAttributes.splice(i,1)
-					  this.radioAttributes = ''
-				  }
-				  this.stockList.splice(i,1)
-			  },
-			  deleteRadio(){
-				  this.radioAttributes = ''
-			  },
-			  changeChecked(item){
-				  item.checked = !item.checked
-			  },
-			  addStockList(){
-				  this.stockList = []
-				  let obj = {
-				  		marketPrice:'',
-				  		sellPrice:'',
-				  		stock:'',
-				  		integral:''
-				  }
-				  if(this.attributesList.length ==1){
-					  let data = {}
-					  let name = this.attributesList[0].attributeName
-					  let value = this.radioAttributes
-					  data[name] = value
-					  obj.attributeJson = JSON.stringify(data)
-					  this.stockList.push(obj)
-				  }else{
-					  this.checkboxAttributes.forEach((tab,index)=>{
-						  let name = this.attributesList[0].attributeName
-						  let value = this.radioAttributes
-						  let tabName = this.attributesList[index+1].attributeName
-						  let tabValue = tab
-						  data[name] = value
-						  data[tabName] = tabValue
-						  obj.attributeJson = JSON.stringify(data)
-						  this.stockList.push(obj)
-					  })
-
-				  }
-			  },
-			  //调起上传图片
-			  srcFileImage() {
-			  	let _that = this
-				let imageUrl = ''
-			  	uni.chooseImage({
-			  		count: 10, //默认9
-			  		sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-			  		sourceType: ['album'], //从相册选择
-			  		success: function(res) {
-			  			const JSESSIONID = utils.uuid()
-			  			uni.uploadFile({
-			  				url: 'http://uat.xingoil.com/adminapi/oil-oss/obejct/uploadFile',
-			  				filePath: res.tempFilePaths[0],
-			  				formData: {
-			  					ossKey: 'xingyou',
-			  					pathKey: 'publicxingyou',
-			  					encrypt: 'PUBLIC',
-			  				},
-			  				name: 'file',
-			  				header: {
-			  					"Content-Type": "multipart/form-data",
-			  					"Authorization": uni.getStorageSync('Authorization'),
-			  					'dataSources': 'MP',
-			  					"imei": uni.getStorageSync('unionid'),
-			  					"openId": uni.getStorageSync('openid'),
-			  					'JSESSIONID': JSESSIONID,
-			  					'token': utils.md5Salt(JSESSIONID)
-			  				},
-			  				success(e) {
-			  					let obj = JSON.parse(e.data),
-			  						imageUrl = obj.data.publicUrl
-									_that.getImage(imageUrl)
-			  				},
-							fail(err) {
-							}
-			  			})
-			  		},fail() {
-			  			console.log('相机调用失败')
-			  		}
-			  	})
-			  },
-			  getImage(imageUrl){
-				  if(JSON.stringify(this.productDate.images) == '[]'){
-				  	this.productDate.images.push({
-				  		url:imageUrl,
-				  		mainMark:1
-				  	})
-				  }else{
-				  	this.productDate.images.push({
-				  		url:imageUrl,
-				  		mainMark:''
-				  	})
-				  }
-			  },
-			  setMainImage(index){
-				  this.productDate.images.forEach((tab,i)=>{
-					  if(i == index){
-						  tab.mainMark = 1
-					  }else{
-						  tab.mainMark = ''
-					  }
-				  })
-			  },
-			  clearImage(index){
-				if(this.productDate.images[index].mainMark == 1){
-					this.productDate.images.splice(index,1)
-					this.productDate.images[0].mainMark = 1
-				}else{
-					this.productDate.images.splice(index,1)
+						}
+					})
+				} else {
+					this.attributesList = []
 				}
-			  },
-			  closed(){
-				  uni.navigateBack()
-			  },
-			  addCompleted(){
-				  if(this.radioItem[0].checked =true){
+
+			},
+			changeRadio(item, index) {
+				if (JSON.stringify(this.checkedList) == '[]') {
+					this.checkedList.push({
+						attributeId: item.id,
+						checked: this.radioAttributes
+					})
+				} else {
+					this.checkedList[index].checked = this.radioAttributes
+				}
+				this.stockCheck()
+
+			},
+			changeCheckBox(item, index) {
+				if (this.checkedList.length < index + 1) {
+					this.checkedList.push({
+						attributeId: item.id,
+						checked: this.radioAttributes
+					})
+				} else {
+					let checked = []
+					this.checkboxAttributes.forEach(tab => {
+						checked.push(tab)
+					})
+					this.checkedList[index].checked = checked.join(',')
+					this.checkedList.checked
+				}
+				this.stockCheck()
+
+			},
+			stockCheck() {
+				this.stockList = []
+				let obj = {
+					marketPrice: '',
+					sellPrice: '',
+					stock: '',
+					integral: ''
+				}
+				if (this.attributesList.length == 1) {
+					let data = {}
+					let name = this.attributesList[0].attributeName
+					let value = this.radioAttributes
+					data[name] = value
+					obj.attributeJson = JSON.stringify(data)
+					this.stockList.push(obj)
+				} else {
+					this.attributesList.forEach((item, ind) => {
+						if (ind != 0) {
+							this.checkboxAttributes.forEach((tab, index) => {
+								let data = {}
+								let tabName = this.attributesList[ind].attributeName
+								let tabValue = tab
+								data[tabName] = tabValue
+								obj.attributeJson = JSON.stringify(data)
+								let stockObj = JSON.parse(JSON.stringify(obj))
+								this.stockList.push(stockObj)
+							})
+						}
+					})
+
+
+				}
+			},
+			deleteCheckAll(i) {
+				if (this.checkboxAttributes.length > 1) {
+					this.checkboxAttributes.splice(i, 1)
+				} else {
+					this.checkboxAttributes.splice(i, 1)
+					this.radioAttributes = ''
+				}
+				this.stockList.splice(i, 1)
+			},
+			deleteRadio() {
+				this.radioAttributes = ''
+			},
+			addStockList() {
+				this.stockList.forEach(tab => {
+					tab.marketPrice = this.bottonList[0].marketPrice
+					tab.sellPrice = this.bottonList[0].sellPrice
+					tab.stock = this.bottonList[0].stock
+					tab.integral = this.bottonList[0].integral
+				})
+			},
+			//调起上传图片
+			srcFileImage() {
+				let _that = this
+				let imageUrl = ''
+				uni.chooseImage({
+					count: 10, //默认9
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ['album'], //从相册选择
+					success: function(res) {
+						const JSESSIONID = utils.uuid()
+						uni.uploadFile({
+							url: 'http://uat.xingoil.com/adminapi/oil-oss/obejct/uploadFile',
+							filePath: res.tempFilePaths[0],
+							formData: {
+								ossKey: 'xingyou',
+								pathKey: 'publicxingyou',
+								encrypt: 'PUBLIC',
+							},
+							name: 'file',
+							header: {
+								"Content-Type": "multipart/form-data",
+								"Authorization": uni.getStorageSync('Authorization'),
+								'dataSources': 'MP',
+								"imei": uni.getStorageSync('unionid'),
+								"openId": uni.getStorageSync('openid'),
+								'JSESSIONID': JSESSIONID,
+								'token': utils.md5Salt(JSESSIONID)
+							},
+							success(e) {
+								let obj = JSON.parse(e.data),
+									imageUrl = obj.data.publicUrl
+								_that.getImage(imageUrl)
+							},
+							fail(err) {}
+						})
+					},
+					fail() {
+						console.log('相机调用失败')
+					}
+				})
+			},
+			getImage(imageUrl) {
+				if (JSON.stringify(this.productDate.images) == '[]') {
+					this.productDate.images.push({
+						url: imageUrl,
+						mainMark: 1
+					})
+				} else {
+					this.productDate.images.push({
+						url: imageUrl,
+						mainMark: ''
+					})
+				}
+			},
+			setMainImage(items, index) {
+				let obj = items
+				obj.mainMark = 1
+				this.productDate.images.splice(index, 1)
+				this.productDate.images.forEach((tab, i) => {
+					tab.mainMark = ''
+				})
+
+				this.productDate.images.unshift(obj)
+			},
+			clearImage(index) {
+				if (this.productDate.images[index].mainMark == 1) {
+					this.productDate.images.splice(index, 1)
+					this.productDate.images[0].mainMark = 1
+				} else {
+					this.productDate.images.splice(index, 1)
+				}
+			},
+			closed() {
+				uni.navigateBack()
+			},
+			addCompleted() {
+				if (this.radioItem[0].checked = true) {
 					this.productDate.newMark == '1'
-				  }else{
-					  this.productDate.newMark == '2'
-				  }
-				  if(this.radioItem[1].checked =true){
-					  this.productDate.recommend == '1'
-				  }else{
-					  this.productDate.recommend == '2'
-				  }
-				  this.productDate.checkedList = this.checkedList
-				  this.productDate.stockList  =  this.stockList
-				  serve.updateProduct(this.productDate).then(res=>{
-				  					  uni.showToast({
-				  					  	title: res.msg,
-				  					  	icon: 'none'
-				  					  })
-									  uni.navigateTo({
-									  	url: `../productList/index`
-									  })
-				  })
-			  }
+				} else {
+					this.productDate.newMark == '2'
+				}
+				if (this.radioItem[1].checked = true) {
+					this.productDate.recommend == '1'
+				} else {
+					this.productDate.recommend == '2'
+				}
+				this.productDate.checkedList = this.checkedList
+				this.productDate.stockList = this.stockList
+				serve.updateProduct(this.productDate).then(res => {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					uni.navigateTo({
+						url: `../productList/index`
+					})
+				})
+			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.fadeBox {
+		width: 100%;
+		margin-bottom: 20rpx;
+	}
 
-		.fadeBox{
-		    width: 100%;
-		    margin-bottom: 20rpx;
-		}
-		#chooseType{
+	#chooseType {
 		padding: 30rpx;
 
-		mulpicker{
+		mulpicker {
 			height: 72rpx;
 			line-height: 72rpx;
 		}
-		/deep/ .uni-forms{
+
+		/deep/ .uni-forms {
 			width: 100%;
 		}
-		.content{
+
+		.content {
 			font-size: 28rpx;
 			font-weight: bold;
 		}
 
 
-		/deep/ .uni-forms-item{
+		/deep/ .uni-forms-item {
 			width: 100%;
 		}
 
-		/deep/ .uni-forms-item__label{
+		/deep/ .uni-forms-item__label {
 			color: #333 !important;
 			font-size: 30rpx;
 			font-weight: 700;
 		}
-		/deep/ .uni-forms-item__content{
+
+		/deep/ .uni-forms-item__content {
 			width: 100%;
-			input{
+
+			input {
 				height: 72rpx;
 				line-height: 72rpx;
 			}
 		}
 
-		switch{
+		switch {
 			margin-top: 9rpx;
 		}
-		switch::before{
-			 content: '';
-		 }
-		 switch::after{
-			 content: '';
-		 }
-		}
-		#instruction{
-			padding: 30rpx;
 
-			mulpicker{
+		switch::before {
+			content: '';
+		}
+
+		switch::after {
+			content: '';
+		}
+	}
+
+	#instruction {
+		padding: 30rpx;
+
+		mulpicker {
+			height: 72rpx;
+			line-height: 72rpx;
+		}
+
+		/deep/ .uni-forms {
+			width: 100%;
+		}
+
+		/deep/ .uni-forms-item {
+			width: 100%;
+		}
+
+		/deep/ .uni-forms-item__label {
+			color: #333 !important;
+			font-size: 30rpx;
+			font-weight: 700;
+		}
+
+		/deep/ .uni-forms-item__content {
+			width: 100%;
+
+			input {
 				height: 72rpx;
 				line-height: 72rpx;
 			}
-			/deep/ .uni-forms{
-				width: 100%;
-			}
-			/deep/ .uni-forms-item{
-				width: 100%;
-			}
+		}
 
-			/deep/ .uni-forms-item__label{
-				color: #333 !important;
-				font-size: 30rpx;
-				font-weight: 700;
-			}
-			/deep/ .uni-forms-item__content{
-				width: 100%;
-				input{
-					height: 72rpx;
-					line-height: 72rpx;
-				}
-			}
-			.tagButton{
-				display: inline-block;
-				width: 133rpx;
-				background: #f5f5f5;
-				color: #666666;
-				border-radius: 8rpx;
-				line-height: 58rpx;
-				text-align: center;
-				margin: 8rpx;
-			}
-			.checkedTag{
-				background-color: #2979ff;
-				color: #FFFFFF;
-			}
-			.redButton{
-				display: inline-block;
-				width: 84rpx;
+		.tagButton {
+			display: inline-block;
+			width: 133rpx;
+			background: #f5f5f5;
+			color: #666666;
+			border-radius: 8rpx;
+			line-height: 58rpx;
+			text-align: center;
+			margin: 8rpx;
+
+			input {
 				height: 58rpx;
-				background: red;
+			}
+		}
+
+		.checkedTag {
+			background-color: #2979ff;
+			color: #FFFFFF;
+		}
+
+		.redButton {
+			position: absolute;
+			right: -84rpx;
+			top: 10rpx;
+			display: inline-block;
+			width: 84rpx;
+			height: 58rpx;
+			background: red;
+			color: #fff;
+			border-radius: 10rpx;
+			line-height: 58rpx;
+			text-align: center;
+		}
+
+		.commodityImage {
+			display: inline-block;
+			max-width: calc(100%-150rpx);
+		}
+
+		.imageList {
+			display: inline-block;
+			width: 140rpx;
+			margin: 0 10rpx;
+		}
+
+		.imageBlack {
+			display: inline-block;
+			width: 140rpx;
+			height: 140rpx;
+			vertical-align: middle;
+			text-align: center;
+			position: relative;
+
+			>image {
+				width: 100%;
+				height: 100%;
+			}
+
+			.cameraText {
+				width: 140rpx;
+				height: 30rpx;
+				text-align: center;
+				line-height: 30rpx;
+				position: absolute;
+				background-color: #333;
+				opacity: 0.3;
+				color: #FFFFFF;
+				left: 0rpx;
+				top: 110rpx;
+			}
+
+			.cameraClear {
+				position: absolute;
+				left: 120rpx;
+				top: -10rpx;
+				z-index: 20;
+			}
+		}
+
+	}
+
+	.checkbox-con {
+		margin-top: 40rpx;
+		text-align: center;
+		position: relative;
+	}
+
+	.checkbox {
+		width: 180rpx;
+		height: 76rpx;
+		line-height: 76rpx;
+		font-size: 30rpx;
+		color: #666666;
+		border: 1rpx solid #B6B6B6;
+		border-radius: 5rpx;
+		display: inline-block;
+		margin: 0 10rpx 20rpx 0;
+		position: absolute;
+		top: 50rpx;
+
+		&:nth-of-type(1) {
+			left: -190rpx;
+		}
+
+		&:nth-of-type(2) {
+			left: 50rpx;
+		}
+	}
+
+	.checked {
+		color: #FFFFFF;
+		background: #FE0606;
+		border: 1rpx solid #FE0606;
+	}
+
+	.checkbox checkbox {
+		display: none
+	}
+
+
+
+
+	.buttons {
+		width: 100%;
+		display: flex;
+		justify-content: space-evenly;
+		margin-top: 180rpx;
+
+		>view {
+			width: 250rpx;
+			height: 76rpx;
+			text-align: center;
+			line-height: 76rpx;
+			border-radius: 10rpx;
+			font-size: 28rpx;
+
+			&:nth-of-type(1) {
+				background: #FFFFFF;
+				border: 1rpx solid #B6B6B6;
+				color: #333;
+			}
+
+			&:nth-of-type(2) {
+				background: #FE0505;
 				color: #fff;
-				border-radius: 10rpx;
-				line-height: 58rpx;
-				text-align: center;
-			}
-			.commodityImage{
-				display: inline-block;
-				max-width: calc(100%-150rpx);
-			}
-			.imageList{
-				display: inline-block;
-				width: 140rpx;
-				margin: 0 10rpx;
-			}
-			.imageBlack{
-				display: inline-block;
-				width: 140rpx;
-				height: 140rpx;
-				vertical-align: middle;
-				text-align: center;
-				position: relative;
-				>image{
-					width: 100%;
-					height: 100%;
-				}
-				.cameraText{
-					width: 140rpx;
-					height: 30rpx;
-					text-align: center;
-					line-height: 30rpx;
-					position: absolute;
-					background-color: #333;
-					opacity: 0.3;
-					color: #FFFFFF;
-					left: 0rpx;
-					top: 110rpx;
-				}
-				.cameraClear{
-					position: absolute;
-					left: 120rpx;
-					top: -10rpx;
-					z-index: 20;
-				}
-			}
-
-		}
-
-		.checkbox-con{
-		 margin-top: 40rpx;
-		 text-align: center;
-		 position: relative;
-		}
-		.checkbox{
-		 width: 180rpx;
-		 height: 76rpx;
-		 line-height: 76rpx;
-		 font-size: 30rpx;
-		 color: #666666;
-		 border: 1rpx solid #B6B6B6;
-		 border-radius: 5rpx;
-		 display: inline-block;
-		 margin: 0 10rpx 20rpx 0;
-		 position: absolute;
-		 top: 50rpx;
-		 &:nth-of-type(1){
-			 left: -190rpx;
-		 }
-		 &:nth-of-type(2){
-			 left: 50rpx;
-		 }
-		}
-
-		.checked{
-		 color: #FFFFFF;
-		 background: #FE0606;
-		 border: 1rpx solid #FE0606;
-		}
-		.checkbox checkbox{
-		 display: none
-		}
-
-
-
-
-		.buttons {
-			width: 100%;
-			display: flex;
-			justify-content: space-evenly;
-			margin-top: 180rpx;
-
-			>view {
-				width: 250rpx;
-				height: 76rpx;
-				text-align: center;
-				line-height: 76rpx;
-				border-radius: 10rpx;
-				font-size: 28rpx;
-
-				&:nth-of-type(1) {
-					background: #FFFFFF;
-					border: 1rpx solid #B6B6B6;
-					color: #333;
-				}
-
-				&:nth-of-type(2) {
-					background: #FE0505;
-					color: #fff;
-				}
 			}
 		}
-		.show{
-		    display: flex;
-		    flex-wrap: wrap;
-		}
-		.hidden{
-		    display: none;
-		}
-</style>
+	}
+
+	.show {
+		display: flex;
+		flex-wrap: wrap;
+	}
+
+	.hidden {
+		display: none;
+	}
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 5a51986..74e0572 100644
--- a/pages.json
+++ b/pages.json
@@ -108,6 +108,21 @@
 				"style": {}
 			}]
 		},
+		{
+			"root": "packageElectron",
+			"pages": [{
+					"path": "index",
+					"style": {}
+				},
+				{
+					"path": "reconciliationDetails/index",
+					"style": {}
+				}, {
+					"path": "components/autograph",
+					"style": {}
+				}
+			]
+		},
 		{
 			"root": "packageOrders",
 			"pages": [{
diff --git a/pages/home/home.vue b/pages/home/home.vue
index fd18300..0d0bd4c 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -445,6 +445,12 @@
 						obj.color = 'blue',
 						obj.badge = 0
 					obj.name = list.roleName
+				}else if (list.roleName == '电子对账单') {
+					obj.cuIcon = 'punch',
+						obj.path = '/packageElectron/index',
+						obj.color = 'blue',
+						obj.badge = 0
+					obj.name = list.roleName
 				}
 				return obj
 			},
-- 
2.49.1


From dfbafd8ea803aab41d4477834ad80c6e8d5bf5e9 Mon Sep 17 00:00:00 2001
From: zhangyouji <zhangyouji@sdxkhlw.cn>
Date: Tue, 16 Apr 2024 17:16:00 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E7=94=B5=E5=AD=90=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/packageElectron/packageElectron.js        |  18 +
 api/packageIntegral/productList.js            |   7 +
 components/my-sign/index.js                   |  16 +
 components/my-sign/my-sign.vue                | 320 ++++++++++++++++++
 packageElectron/components/autograph.vue      | 188 +++++++++-
 packageElectron/index.vue                     | 257 ++++++--------
 .../reconciliationDetails/index.vue           | 192 ++++++++++-
 packageIntegral/productAddition/index.vue     | 168 +++++++--
 packageIntegral/productList/index.vue         |  23 +-
 packageIntegral/productUpdate/index.vue       | 169 +++++++--
 pages.json                                    |  20 +-
 11 files changed, 1171 insertions(+), 207 deletions(-)
 create mode 100644 api/packageElectron/packageElectron.js
 create mode 100644 components/my-sign/index.js
 create mode 100644 components/my-sign/my-sign.vue

diff --git a/api/packageElectron/packageElectron.js b/api/packageElectron/packageElectron.js
new file mode 100644
index 0000000..0e69b48
--- /dev/null
+++ b/api/packageElectron/packageElectron.js
@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+export default{
+	getByPage(data) {
+		return request({
+			url: `/oil-finance/xoilSiteElectronicStatement/getByPage`,
+			method: 'post',
+			data
+		})
+	},
+	update(data) {
+		return request({
+			url: `/oil-finance/xoilSiteElectronicStatement/update`,
+			method: 'PUT',
+			data
+		})
+	}
+}
\ No newline at end of file
diff --git a/api/packageIntegral/productList.js b/api/packageIntegral/productList.js
index 84df717..6077a23 100644
--- a/api/packageIntegral/productList.js
+++ b/api/packageIntegral/productList.js
@@ -66,4 +66,11 @@ export default{
 			data
 		})
 	},
+	deleteProductById(data) { // 删除商品接口
+		return request({
+			url: `/oil-mall/mobile/deleteProductById`,
+			method: 'post',
+			data
+		})
+	},
 }
\ No newline at end of file
diff --git a/components/my-sign/index.js b/components/my-sign/index.js
new file mode 100644
index 0000000..ab58258
--- /dev/null
+++ b/components/my-sign/index.js
@@ -0,0 +1,16 @@
+/**
+ * 判断是否未数值
+ * @param {Object} val
+ */
+export function isNumber(val) {
+	return !isNaN(Number(val))
+}
+
+/**
+ * 处理大小单位
+ * @param {Object} val
+ */
+export function formatSize(val, unit = 'rpx') {
+	return isNumber(val) ? `${val}${unit}` : val
+}
+
diff --git a/components/my-sign/my-sign.vue b/components/my-sign/my-sign.vue
new file mode 100644
index 0000000..352095a
--- /dev/null
+++ b/components/my-sign/my-sign.vue
@@ -0,0 +1,320 @@
+<template>
+	<view class="signature-wrap">
+		<canvas
+			:canvas-id="cid"
+			:id="cid"
+			@touchstart="onTouchStart"
+			@touchmove="onTouchMove"
+			@touchend="onTouchEnd"
+			disable-scroll
+			:style="[
+				{
+					width: width && formatSize(width),
+					height: height && formatSize(height)
+				},
+				customStyle
+			]"
+		></canvas>
+		<slot />
+	</view>
+</template>
+
+<script>
+/**
+ * sign canvas 手写签名
+ * @description 设置线条宽度、颜色，撤回，清空
+ * @tutorial
+ * @property {String} cid canvas id 不设置则默认为 v-sign-时间戳
+ * @property {String, Number} width canvas 宽度
+ * @property {String, Number} height canvas 高度
+ * @property {bgColor} bgColor 画布背景颜色
+ * @property {Object} customStyle canvas 自定义样式
+ * @property {String} lineWidth 画笔大小，权重小于 v-sign-pen 组件设置的画笔大小
+ * @property {Number} lineColor 画笔颜色，权重小于 v-sign-pen 组件设置的画笔大小
+ * @event {Function} init 当创建完 canvas 实例后触发，向外提供 canvas实例，撤回，清空方法
+ * @example <v-sign @init="signInit"></v-sign>
+ */
+import { formatSize } from './index.js'
+
+export default {
+	name: 'my-sign',
+	props: {
+		// canvas id
+		cid: {
+			type: String,
+			default: `v-sign-${Date.now()}`
+			// required: true
+		},
+		// canvas 宽度
+		width: {
+			type: [String, Number]
+		},
+		// canvas 高度
+		height: {
+			type: [String, Number]
+		},
+		// 画笔大小，权重小于 v-sign-pen 组件设置的画笔大小 penLineWidth
+		lineWidth: {
+			type: Number,
+			default: 4
+		},
+		// 线颜色，权重小于 v-sign-color 组件设置的画笔颜色 penLineColor
+		lineColor: {
+			type: String,
+			default: '#333'
+		},
+		// 画布背景颜色
+		bgColor: {
+			type: String,
+			default: '#fff'
+		},
+		// canvas自定义样式
+		customStyle: {
+			type: Object,
+			default: () => ({})
+		}
+	},
+	provide() {
+		return {
+			getSignInterface: this.provideSignInterface
+		}
+	},
+	data() {
+		return {
+			formatSize,
+			lineData: [],
+			winWidth: 0,
+			winHeight: 0,
+			penLineWidth: null, // v-sign-pen 组件设置的画笔大小
+			penLineColor: null // v-sign-color 组件设置的颜色
+		}
+	},
+	created() {
+		// 获取窗口宽高
+		const { windowWidth, windowHeight } = uni.getSystemInfoSync()
+		this.winWidth = windowWidth
+		this.winHeight = windowHeight
+	},
+	mounted() {
+		this.canvasCtx = uni.createCanvasContext(this.cid, this)
+		// h5 需延迟绘制，否则绘制失败
+		// #ifdef H5
+		setTimeout(() => {
+			// #endif
+			this.setBackgroundColor(this.bgColor)
+			// #ifdef H5
+		}, 10)
+		// #endif
+		// 初始化完成，触发 init 事件
+		this.$emit('init', this.provideSignInterface())
+	},
+	methods: {
+		onTouchStart(e) {
+			const pos = e.touches[0]
+			this.lineData.push({
+				style: {
+					color: this.penLineColor || this.lineColor,
+					width: this.penLineWidth || this.lineWidth
+				},
+				// 屏幕坐标
+				coordinates: [
+					{
+						type: e.type,
+						x: pos.x,
+						y: pos.y
+					}
+				]
+			})
+			this.drawLine()
+		},
+		onTouchMove(e) {
+			const pos = e.touches[0]
+			this.lineData[this.lineData.length - 1].coordinates.push({
+				type: e.type,
+				x: pos.x,
+				y: pos.y
+			})
+			this.drawLine()
+		},
+		onTouchEnd(e) {
+			this.$emit('end', this.lineData)
+		},
+		// 清空画布
+		clear() {
+			this.lineData = []
+			this.canvasCtx.clearRect(0, 0, this.winWidth, this.winHeight)
+			this.canvasCtx.draw()
+			this.setBackgroundColor(this.bgColor)
+			this.$emit('clear')
+		},
+		// 撤销
+		revoke() {
+			this.setBackgroundColor(this.bgColor)
+			this.lineData.pop()
+			this.lineData.forEach((item, index) => {
+				this.canvasCtx.beginPath()
+				this.canvasCtx.setLineCap('round')
+				this.canvasCtx.setStrokeStyle(item.style.color)
+				this.canvasCtx.setLineWidth(item.style.width)
+				if (item.coordinates.length < 2) {
+					const pos = item.coordinates[0]
+					this.canvasCtx.moveTo(pos.x, pos.y)
+					this.canvasCtx.lineTo(pos.x + 1, pos.y)
+				} else {
+					item.coordinates.forEach(pos => {
+						if (pos.type == 'touchstart') {
+							this.canvasCtx.moveTo(pos.x, pos.y)
+						} else {
+							this.canvasCtx.lineTo(pos.x, pos.y)
+						}
+					})
+				}
+				this.canvasCtx.stroke()
+			})
+			this.canvasCtx.draw(true)
+			this.$emit('revoke', this.lineData)
+		},
+		// 绘制线条
+		drawLine() {
+			const lineDataLen = this.lineData.length
+			if (!lineDataLen) return
+			const currentLineData = this.lineData[lineDataLen - 1]
+			const coordinates = currentLineData.coordinates
+			const coordinatesLen = coordinates.length
+			if (!coordinatesLen) return
+			let startPos
+			let endPos
+			if (coordinatesLen < 2) {
+				// only start, no move event
+				startPos = coordinates[coordinatesLen - 1]
+				endPos = {
+					x: startPos.x + 1,
+					y: startPos.y
+				}
+			} else {
+				startPos = coordinates[coordinatesLen - 2]
+				endPos = coordinates[coordinatesLen - 1]
+			}
+
+			const style = currentLineData.style
+			this.canvasCtx.beginPath()
+			this.canvasCtx.setLineCap('round')
+			this.canvasCtx.setStrokeStyle(style.color)
+			this.canvasCtx.setLineWidth(style.width)
+			this.canvasCtx.moveTo(startPos.x, startPos.y)
+			this.canvasCtx.lineTo(endPos.x, endPos.y)
+			// const P1 = this.caculateBezier(startPos, endPos, centerPos)
+			// console.log(P1.x, P1.y)
+			// this.canvasCtx.moveTo(startPos.x, startPos.y)
+			// this.canvasCtx.quadraticCurveTo(P1.x, P1.y, endPos.x, endPos.y)
+			this.canvasCtx.stroke()
+			this.canvasCtx.draw(true)
+		},
+		// 保存png图片，文件名配置 filename 仅支持 h5
+		async saveImage(filename = '签名') {
+			const tempFilePath = await this.canvasToTempFilePath()
+			return new Promise((resolve, reject) => {
+				// #ifdef H5
+				try {
+					const a = document.createElement('a')
+					a.href = tempFilePath
+					a.download = filename
+					document.body.appendChild(a)
+					a.click()
+					a.remove()
+					resolve({
+						errMsg: 'saveImageH5:ok'
+					})
+				} catch (e) {
+					console.error(e)
+					reject(e)
+				}
+				// #endif
+				// #ifndef H5
+				uni.saveImageToPhotosAlbum({
+					filePath: tempFilePath,
+					success(resObj) {
+						resolve(resObj)
+					},
+					fail(err) {
+						reject(err)
+					}
+				})
+				// #endif
+			})
+		},
+		// canvas 保存为临时图片路径，h5返回 base64
+		canvasToTempFilePath(conf = {}) {
+			return new Promise((resolve, reject) => {
+				uni.canvasToTempFilePath(
+					{
+						canvasId: this.cid,
+						...conf,
+						success: res => {
+							resolve(res.tempFilePath)
+						},
+						fail: err => {
+							console.log('fail', err)
+							reject(err)
+						}
+					},
+					this
+				)
+			})
+		},
+		setBackgroundColor(color = '#fff') {
+			this.canvasCtx.beginPath()
+			this.canvasCtx.setFillStyle(color)
+			this.canvasCtx.fillRect(0, 0, this.winWidth, this.winHeight)
+			this.canvasCtx.fill()
+			this.canvasCtx.draw(true)
+		},
+		setLineWidth(numberVal) {
+			this.penLineWidth = numberVal
+		},
+		setLineColor(strValue) {
+			this.penLineColor = strValue
+		},
+		// 向外暴露内部方法
+		provideSignInterface() {
+			return {
+				cid: this.cid,
+				ctx: this.canvasCtx,
+				clear: this.clear,
+				revoke: this.revoke,
+				saveImage: this.saveImage,
+				canvasToTempFilePath: this.canvasToTempFilePath,
+				setLineWidth: this.setLineWidth,
+				setLineColor: this.setLineColor,
+				setBackgroundColor: this.setBackgroundColor,
+				getLineData: () => this.lineData
+			}
+		},
+		/**
+		 * 计算二次贝塞尔曲线 控制点 P1
+		 * 起点 P0(x0,y0)、控制点P1(x1, y1)、P2(x2, y2)、曲线上任意点B(x, y)
+		 * 二次贝塞尔公式：B(t) = (1-t)²P0 + 2t(1-t)P1 + t²P2
+		 * 代入坐标得：
+		 * x = (1-t)²*x0 + 2t(1-t)*x1 + t²*x2
+		 * y = (1-t)²*y0 + 2t(1-t)*y1 + t²*y2
+		 */
+		caculateBezier(P0, P2, B, t = 0.5) {
+			const { x: x0, y: y0 } = P0
+			const { x: x2, y: y2 } = P2
+			const { x, y } = B
+			let x1 = (x - (1 - t) * (1 - t) * x0 - t * t * x2) / (2 * t * (1 - t))
+			let y1 = (y - (1 - t) * (1 - t) * y0 - t * t * y2) / (2 * t * (1 - t))
+			return {
+				x: x1,
+				y: y1
+			}
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.signature-wrap {
+	position: relative;
+}
+</style>
diff --git a/packageElectron/components/autograph.vue b/packageElectron/components/autograph.vue
index 02409e3..39d4cc0 100644
--- a/packageElectron/components/autograph.vue
+++ b/packageElectron/components/autograph.vue
@@ -1,8 +1,192 @@
 <template>
+	<view class="sign-contain">
+		<view class="sign-top">
+			请在空白处签字
+		</view>
+		<my-sign @init="onSignInit" @end="endConfirm" bgColor="#fff" width="100%" :height="signHeight">
+		</my-sign>
+
+		<!-- 按钮 -->
+		<view class="signBtn-box">
+			<view class="signBtn-item1">
+				<button type="default" plain="true" class="lnvestor-btn" hover-class="hover"
+					@click="cancelBtn">取消</button>
+			</view>
+			<view class="signBtn-item2">
+				<button type="default" plain="true" class="lnvestor-btn1" hover-class="hover"
+					@click="clear">清空重写</button>
+				<button type="primary" class="lnvestor-btn2" hover-class="hover"
+					@click="submitBtn" :disabled="vsignDisabled">提交签名</button>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
+	import utils from '@/utils/encode'
+	export default {
+		data() {
+			return {
+				signHeight: '375px',
+				vsignDisabled: true,
+				detailsData:{}
+			}
+		},
+		onLoad(option) {
+			if(option!='{}'){
+				let stationData = JSON.parse(option.data)
+				this.detailsData = stationData
+			}
+			var that = this;
+			uni.getSystemInfo({
+				success: function(res) {
+					console.log('屏幕信息', res)
+					that.signHeight = (res.windowHeight-130)+"px";
+				}
+			})
+		},
+		methods: {
+			submitBtn(){
+				let File = this.signCtx.canvasToTempFilePath()
+				let imageUrl = ''
+				File.then(res=>{
+					let _that = this
+					const JSESSIONID = utils.uuid()
+					uni.uploadFile({
+						url: 'http://uat.xingoil.com/adminapi/oil-oss/obejct/uploadFile',
+						filePath: res,
+						formData: {
+							ossKey: 'xingyou',
+							pathKey: 'publicxingyou',
+							encrypt: 'PUBLIC',
+						},
+						name: 'file',
+						header: {
+							"Content-Type": "multipart/form-data",
+							"Authorization": uni.getStorageSync('Authorization'),
+							'dataSources': 'MP',
+							"imei": uni.getStorageSync('unionid'),
+							"openId": uni.getStorageSync('openid'),
+							'JSESSIONID': JSESSIONID,
+							'token': utils.md5Salt(JSESSIONID)
+						},
+						success(e) {
+							let obj = JSON.parse(e.data),
+								imageUrl = obj.data.publicUrl
+								_that.getImage(imageUrl)
+						},
+						fail(err) {}
+					})
+					
+				})
+				
+				
+				
+			},
+			getImage(imageUrl){
+				this.detailsData.signatureUrl = imageUrl
+				let stationInfo = JSON.stringify(this.detailsData)
+				uni.redirectTo({
+					url: `../reconciliationDetails/index?data=${stationInfo}`
+				})
+			},
+			// 取消
+			cancelBtn(){
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			// 清除
+			clear() {
+				this.signCtx.clear();
+				this.vsignDisabled = true;
+			},
+			onSignInit(signCtx) {
+				this.signCtx = signCtx
+			},
+			// 绘画结束触发
+			endConfirm() {
+				this.vsignDisabled = false;
+			}
+		}
+	}
 </script>
 
-<style>
-</style>
\ No newline at end of file
+<style lang="scss">
+	.sign-contain {
+		padding-left: 35rpx;
+		padding-right: 35rpx;
+
+		.sign-top {
+			width: 100%;
+			height: 50px;
+			line-height: 50px;
+			font-size: 16px;
+			text-align: center;
+			color: #999999;
+		}
+
+		.signBtn-box {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.signBtn-item1 {
+
+				// 按钮样式
+				.lnvestor-btn {
+					margin-top: 11px;
+					width: 94px;
+					height: 40px;
+					border-radius: 20px;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					font-size: 16px;
+				}
+
+				.hover {
+					border: 1px solid #ccc !important;
+					color: #ccc !important;
+					font-size: 16px !important;
+				}
+			}
+
+			.signBtn-item2 {
+				display: flex;
+
+				// 按钮样式
+				.lnvestor-btn1 {
+					margin-top: 11px;
+					width: 128px;
+					height: 40px;
+					border-radius: 20px;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					font-size: 16px;
+					margin-right: 16px;
+				}
+
+				.lnvestor-btn2 {
+					margin-top: 11px;
+					width: 128px;
+					height: 40px;
+					border-radius: 20px;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					background: #b99c65;
+					font-size: 16px;
+				}
+
+				.hover {
+					border: 1px solid #ccc !important;
+					color: #ccc !important;
+					font-size: 16px !important;
+				}
+			}
+		}
+	}
+</style>
+
diff --git a/packageElectron/index.vue b/packageElectron/index.vue
index ff853b0..e991e75 100644
--- a/packageElectron/index.vue
+++ b/packageElectron/index.vue
@@ -2,29 +2,33 @@
 	<view class="container">
 		<cu-custom class="main-totextbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
 			<block slot="backText">返回</block>
-			<block slot="content">商品列表</block>
+			<block slot="content">电子对账单</block>
 		</cu-custom>
 
 		<view class="options-frame">
 			<view v-for="item,index in optionsList" :key="index" :class="index == currentIndex ? 'active':''"
-				@click="selectOptions(index)">{{item.text}}<text>({{item.count}})</text></view>
+				@click="selectOptions(index)">{{item.text}}</view>
 		</view>
 
 		<scroll-view v-if="dataList.length" class="list" :scroll-y="true" @scrolltolower="lower">
 			<view class="item" v-for="item,index in dataList" :key="index">
 			
-				<view class="introduce">
-					<image :src="item.url"></image>
-					<view>{{item.productName}}</view>
-					<view>规格：默认</view>
-					<view>库存：{{item.totalStock}}</view>
-				</view>
-				<view class="footer">
-					<view class="button">删除</view>
-					<view class="button">编辑</view>
+				<view v-if="item.status!=0" class="introduce" @click="openDetails(item)">
+					<view>{{item.id}}</view>
+					<view>
+						结算周期：
+						<view>{{item.beginReconciliationTime}}至 {{item.endReconciliationTime}}</view>
+					</view>
+					<view>结算金额：{{item.statementAmount}}元</view>
+					<view>推送时间：{{item.reviewTime?item.reviewTime:'暂无'}}</view>
+					<view class="footer">
+						<view v-if="item.status ==1" class="button" @click="openDetails(item)">点击确认</view>
+						<view v-if="item.status ==2" class="buttonConfirmed">已确认</view>
+						<view v-if="item.status ==3" class="buttonError">金额有误</view>
+					</view>
 				</view>
+				
 			</view>
-			<view style="height: 30rpx; background: #fff;"></view>
 		</scroll-view>
 		<view v-else class="empty">
 			<image src="https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/yunsite-empty.png"></image>
@@ -35,12 +39,9 @@
 </template>
 
 <script>
-	import serve from '@/api/packageIntegral/productList.js'
+	import serve from '@/api/packageElectron/packageElectron.js'
 
 	export default {
-		options: {
-			styleIsolation: 'shared'
-		},
 		data() {
 			return {
 				currentIndex: 0,
@@ -49,22 +50,18 @@
 					pagesize: 20,
 					params: {},
 				},
-				dataList: [{},{}],
+				dataList: [],
 				optionsList: [{
 					text: '全部',
-					count: 0,
 					value: ''
 				}, {
 					text: '待确认',
-					count: 0,
 					value: ''
 				}, {
 					text: '已确认',
-					count: 0,
 					value: ''
 				}, {
 					text: '金额异常',
-					count: 0,
 					value: ''
 				}],
 		
@@ -73,36 +70,58 @@
 		},
 
 		onLoad() {
-			// this.productByPage()
-			// this.getTopInfo()
+			this.getByPage()
 		},
 
 		methods: {
 			selectOptions(index) {
 				this.currentIndex = index
-				console.log(index,'index')
+				this.paramter.currentPage = 1
 				if(index == 0){
 					this.paramter.params ={}
+					this.paramter.params.status = '5'
 				}else if(index ==1){
 					this.paramter.params ={}
-					this.paramter.params.productStatus = 1
+					this.paramter.params.status = '1'
 				}else if(index ==2){
 					this.paramter.params ={}
-					this.paramter.params.productStatus = 2
+					this.paramter.params.status = '2'
 				}else if(index ==3){
 					this.paramter.params ={}
-					this.paramter.params.auditStatus = 1
+					this.paramter.params.status = '3'
 				}
-				// this.productByPage()
+				this.getByPage()
+			},
+			getByPage(){
+				serve.getByPage(this.paramter).then(res=>{
+					if (res.code === 20000) {
+						if (!res.data.list.length&&this.paramter.currentPage!=1) {
+							uni.showToast({
+								title: '没有更多结算单啦~',
+								icon: 'none'
+							})
+							return
+						}
+						if (this.paramter.currentPage == 1) {
+							this.dataList = []
+						}
+						this.dataList = this.dataList.concat(res.data.list)
+					}
+				})
 			},
 		
 	
 		
 			lower() {
 				this.paramter.currentPage += 1
-				// this.productByPage()
+				this.getByPage()
 			},
-	
+			openDetails(item){
+				let stationInfo = JSON.stringify(item)
+				uni.navigateTo({
+					url: `./reconciliationDetails/index?data=${stationInfo}`
+				})
+			}
 		
 		}
 	}
@@ -117,8 +136,8 @@
 		>.options-frame {
 			display: flex;
 			justify-content: space-between;
-			margin-top: 43rpx;
 			padding: 0 31rpx;
+			background: #fff;
 
 
 			>view {
@@ -128,146 +147,94 @@
 				line-height: 66rpx;
 				text-align: center;
 				color: #000000;
-				background: #F7F7F7;
 
 				>text {
 					color: #F83D3D;
 				}
 
 				&.active {
-					color: #FFF;
-					background: #F83D3D;
-
-					>text {
-						color: #fff;
-					}
+					color: #e19555;
+					border-bottom: 4rpx solid #e19555;
 				}
 			}
 		}
 
 
 		>.list {
-			margin-top: 35rpx;
+			margin: 30rpx;
 			flex: 1;
 			overflow-y: hidden;
-
 			.item {
-				position: relative;
-				margin-top: 20rpx;
-				background: #fff;
-				// min-height: 106rpx;
-				// border-bottom: 12rpx solid #F1F2F7;
-
-				&:nth-of-type(1) {
-					margin-top: 0
-				}
-
-				.header {
-					// padding: 26rpx 23rpx 0;
-					height: 60rpx;
-					// line-height: 83rpx;
-					width: 100%;
-					font-size: 30rpx;
-					color: #666;
-					border-top: 1rpx solid #D7D7D7;
-
-					.identifying{
-						width: 120rpx;
-						height: 60rpx;
-						line-height: 60rpx;
-						// background-color: #F83D3D;
-						color: #FFF;
-						text-align: center;
-						border-bottom-right-radius: 30rpx;
-					}
-				}
-
+				margin: 20rpx 60rpx 0 0;
 				.introduce {
-					position: relative;
-					padding: 24rpx 29rpx 31rpx 268rpx;
+					padding: 12rpx 24rpx 24rpx;
 					min-height: 220rpx;
-
-					>image {
-						position: absolute;
-						top: 13rpx;
-						left: 34rpx;
-						width: 220rpx;
-						height: 220rpx;
-						// border: 1px solid #333;
+					background: #fff;
+					border: 2rpx solid #d7d7d7;
+					border-radius: 10rpx;
+					>view{
+						padding: 10rpx 0;
 					}
-
-					>view {
-						&:nth-of-type(1) {
-							font-size: 28rpx;
-							color: #000;
-						}
-
-						&:nth-of-type(2),
-						&:nth-of-type(3) {
-							margin-top: 11rpx;
-							font-size: 24rpx;
-							color: #999;
-						}
-
-						&:nth-of-type(3) {
-							margin-top: 18rpx;
-
-						}
-
-						&:nth-of-type(4) {
-							margin-top: 11rpx;
-							font-size: 28rpx;
-							color: #F83D3D;
-						}
+					>view:nth-child(1){
+						font-weight: bold;
+						padding-bottom: 12rpx;
+						border-bottom: 2rpx solid #d7d7d7;
 					}
-				}
-				.examine{
-					width: 120rpx;
-					height: 45rpx;
-					color: #FFF;
-					text-align: center;
-					line-height: 45rpx;
-					position: absolute;
-					right: 50rpx;
-					top: 180rpx;
-				}
-
-				>.footer {
-					position: relative;
-					height: 58rpx;
-					line-height: 58rpx;
-					padding: 0 34rpx 40rpx;
-					font-size: 32rpx;
-					color: #000;
-					font-weight: 550;
-
-					.button {
-						position: absolute;
-						top: 0;
-						width: 128rpx;
+					>.footer {
+						position: relative;
 						height: 58rpx;
 						line-height: 58rpx;
-						text-align: center;
-						font-size: 28rpx;
-						color: #999;
-						background: #FFF;
-						border: 1px solid #999;
-						border-radius: 10rpx;
-					}
-
-					>.button{
-						&:nth-of-type(1){
-							right: 360rpx;
+						padding: 0 34rpx 40rpx;
+						font-size: 32rpx;
+						color: #000;
+						font-weight: 550;
+					
+						.button {
+							position: absolute;
+							top: 0;
+							right: 10rpx;
+							width: 150rpx;
+							height: 58rpx;
+							line-height: 58rpx;
+							text-align: center;
+							font-size: 28rpx;
+							color: #fff;
+							background: #169bd5;
+							border-radius: 10rpx;
 						}
-						&:nth-of-type(2){
-							right: 200rpx;
+						.buttonConfirmed{
+							position: absolute;
+							top: -85rpx;
+							right: 10rpx;
+							width: 150rpx;
+							height: 150rpx;
+							line-height: 150rpx;
+							text-align: center;
+							font-size: 28rpx;
+							color: #fff;
+							background: #7f7f7f;
+							border-radius: 75rpx;
+							transform: rotate(-45deg);
 						}
-						&:nth-of-type(3){
-							right: 40rpx;
+						.buttonError{
+							position: absolute;
+							top: -85rpx;
+							right: 10rpx;
+							width: 150rpx;
+							height: 150rpx;
+							line-height: 150rpx;
+							text-align: center;
+							font-size: 28rpx;
+							color: #fff;
+							background: #d9001b;
+							border-radius: 75rpx;
+							transform: rotate(-45deg);
 						}
-
+					
+					
 					}
 				}
+
 			}
 		}
 
diff --git a/packageElectron/reconciliationDetails/index.vue b/packageElectron/reconciliationDetails/index.vue
index 02409e3..a5da1c8 100644
--- a/packageElectron/reconciliationDetails/index.vue
+++ b/packageElectron/reconciliationDetails/index.vue
@@ -1,8 +1,198 @@
 <template>
+	<view class="container">
+		<cu-custom class="main-totextbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
+			<block slot="backText">返回</block>
+			<block slot="content">对账单详情</block>
+		</cu-custom>
+		<view class="body">
+			<view class="borderItem">
+				<text>结算周期：</text>
+				<view>{{detailsData.beginReconciliationTime}}至 {{detailsData.endReconciliationTime}}</view>
+				</view>
+			<view class="borderItem">
+				<text>上期结转金额：</text>{{detailsData.lastBalance}}
+				</view>
+			<view class="borderItem">
+				<text>打款金额：</text>{{detailsData.amount}}
+				</view>
+			<view class="borderItem">
+				<text>消耗体积：</text>{{detailsData.volume}}
+				</view>
+			<view class="borderItem">
+				<text>结算金额：</text>{{detailsData.statementAmount}}
+				</view>
+			<view class="borderItem">
+				<text>余额：</text>{{detailsData.balance}}
+				</view>
+			<view class="borderItem">
+				<text>充值应返返利金额：</text>{{detailsData.rechargeRebateAmount?detailsData.rechargeRebateAmount:0}}
+				</view>
+			<view class="borderItem">
+				<text>充值已返返利金额：</text>{{detailsData.realRechargeRebateAmount?detailsData.realRechargeRebateAmount:0}}
+				</view>
+			<view class="borderItem">
+				<text>消费应返返利金额：</text>{{detailsData.consumeRebateAmount?detailsData.consumeRebateAmount:0}}
+				</view>
+			<view class="borderItem">
+				<text>消费已返返利金额：</text>{{detailsData.realConsumeRebateAmount?detailsData.realConsumeRebateAmount:0}}
+				</view>
+			<view class="borderarea">
+				<view>备注：</view>
+				<view class="uni-textarea" style="height: 100rpx;">
+					<textarea style="height: 100rpx;" v-model="detailsData.remark"  />
+				</view>
+			</view>
+			<view v-if="detailsData.signatureUrl">
+				<image :src="detailsData.signatureUrl" style="height: 240rpx;"></image>
+			</view>
+			<view>
+				<view class="footer">
+					<view v-if="detailsData.status==1" class="button" @click="updateStatus(3)">金额有误</view>
+					<view v-if="!detailsData.signatureUrl&&detailsData.status==1" class="button" @click="toAutograph">确认无误并签字</view>
+					<view v-if="detailsData.signatureUrl&&detailsData.status==1" class="button"  @click="updateStatus(2)">保存并提交</view>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
+	import serve from '@/api/packageElectron/packageElectron.js'
+
+	export default {
+		data() {
+			return {
+				detailsData:{}
+			}
+		},
+
+		onLoad(option) {
+			if(option!='{}'){
+				let stationData = JSON.parse(option.data)
+				this.detailsData = stationData
+			}
+			
+		},
+
+		methods: {
+			toAutograph(){
+				let stationInfo = JSON.stringify(this.detailsData)
+				uni.redirectTo({
+					url: `../components/autograph?data=${stationInfo}`
+				})
+			},
+			updateStatus(val){
+				if(val==3){
+					this.detailsData.signatureUrl = ''
+					delete this.detailsData.signatureUrl
+				}
+				this.detailsData.status = val
+				serve.update(this.detailsData).then(res=>{
+					if (res.code === 20000) {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none'
+							})
+							wx.redirectTo({
+								url: `../index`
+							})
+					}
+				})
+			}
+
+
+		}
+	}
 </script>
 
-<style>
+<style lang="scss" scoped>
+	.container {
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		background: #f1f2f7 !important;
+
+		.body {
+			height: calc(100vh - 48rpx);
+			margin: 24rpx;
+			background: #ffffff;
+			padding: 30rpx;
+			border-radius: 20rpx;
+
+			.borderItem {
+				border-bottom: 1px solid #aaaaaa;
+				margin: 15rpx 0;
+				>text{
+					display: inline-block;
+					width: 300rpx;
+				}
+			}
+
+			>view:nth-child(1) {
+				margin: 0;
+				padding: 0 0 30rpx 0;
+				font-size: 32rpx;
+			}
+
+			.borderarea {
+				display: flex;
+
+				>view:nth-child(1) {
+
+					width: 100rpx;
+				}
+
+				>view:nth-child(2) {
+
+					width: 550rpx;
+
+					>textarea {
+						width: 550rpx;
+						height: 300rpx;
+						border: 1px solid #aaaaaa;
+					}
+				}
+			}
+			.footer {
+				position: relative;
+				height: 58rpx;
+				line-height: 58rpx;
+				padding: 0 34rpx 40rpx;
+				font-size: 32rpx;
+				color: #000;
+				font-weight: 550;
+				margin-top: 40rpx;
+			
+				.button {
+					position: absolute;
+					top: 0;
+					width: 220rpx;
+					height: 58rpx;
+					line-height: 58rpx;
+					text-align: center;
+					font-size: 28rpx;
+					color: #fff;
+					border-radius: 10rpx;
+				}
+			
+				>.button {
+					&:nth-of-type(1) {
+						right: 260rpx;
+						background: #d9001b;
+					}
+			
+					&:nth-of-type(2) {
+						right: 0rpx;
+						background: #169bd5;
+					}
+		
+			
+				}
+			}
+			
+			
+		}
+
+
+	}
 </style>
\ No newline at end of file
diff --git a/packageIntegral/productAddition/index.vue b/packageIntegral/productAddition/index.vue
index 54e42f7..7df9313 100644
--- a/packageIntegral/productAddition/index.vue
+++ b/packageIntegral/productAddition/index.vue
@@ -51,12 +51,12 @@
 
 		<view id="instruction" :class="currentBoxId == 'instruction' ? 'show' : 'hidden'">
 			<uni-forms :modelValue="productDate" label-width="200rpx">
-				<uni-forms-item label="属性类别:">
+				<uni-forms-item label="选择规格:">
 					<uni-data-select v-model="productDate.attributesTypeId" :localdata="attributesTypeList"
-						placeholder="请选择商品品牌" @change="attributesData"></uni-data-select>
+						placeholder="请选择规格" @change="attributesData"></uni-data-select>
 				</uni-forms-item>
 				<view class="content" v-show="productDate.attributesTypeId">
-					<view style="margin: 10rpx 0;">商品类型：</view>
+					<view style="margin: 10rpx 0;">商品规格：</view>
 					<view>
 						<uni-section type="line">
 							<view class="uni-px-5" v-for="(item,index) in attributesList">
@@ -170,6 +170,7 @@
 				isBoxShow: false,
 				productDate: {
 					productStatus: '1',
+					newMark: 1,
 					images: []
 				},
 				productList: [],
@@ -268,16 +269,18 @@
 			checkbox(e) {
 				var index = e; //获取当前点击的下标
 				var checkboxArr = this.radioItem; //选项集合
-				// if (checkboxArr[index].checked) return;//如果点击的当前已选中则返回
-				// checkboxArr.forEach(item => {
-				//  item.checked = false
-				// })
-				if (checkboxArr[index].checked == false) {
-					checkboxArr[index].checked = true; //改变当前选中的checked值
+				if (checkboxArr[index].checked) return; //如果点击的当前已选中则返回
+				checkboxArr.forEach(item => {
+					item.checked = false
+				})
+				checkboxArr[index].checked = true; //改变当前选中的checked值
 
-				} else {
-					checkboxArr[index].checked = false; //改变当前选中的checked值
-				}
+				// if (checkboxArr[index].checked == false) {
+				// 	checkboxArr[index].checked = true; //改变当前选中的checked值
+
+				// } else {
+				// 	checkboxArr[index].checked = false; //改变当前选中的checked值
+				// }
 				if (checkboxArr[0].checked == true) {
 					this.productDate.newMark = 1
 				} else {
@@ -294,6 +297,13 @@
 				let currentFlag = e.currentTarget.id;
 				if (currentFlag == 'next') {
 					this.$refs.productForm.validate().then(res => {
+						if (this.isNumber(this.productDate.price) == false) {
+							uni.showToast({
+								title: '商品售价不是数字',
+								icon: 'none'
+							})
+							return
+						}
 						switch (currentFlag) {
 							case 'next':
 								this.currentBoxId = 'instruction'
@@ -383,7 +393,7 @@
 				if (this.checkedList.length < index + 1) {
 					this.checkedList.push({
 						attributeId: item.id,
-						checked: this.radioAttributes
+						checked: item.attributesList[index].value
 					})
 				} else {
 					let checked = []
@@ -456,7 +466,7 @@
 				let _that = this
 				let imageUrl = ''
 				uni.chooseImage({
-					count: 10, //默认9
+					count: 1, //默认9
 					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
 					sourceType: ['album'], //从相册选择
 					success: function(res) {
@@ -493,17 +503,25 @@
 				})
 			},
 			getImage(imageUrl) {
-				if (JSON.stringify(this.productDate.images) == '[]') {
-					this.productDate.images.push({
-						url: imageUrl,
-						mainMark: 1
-					})
+				if (this.productDate.images.length < 10) {
+					if (JSON.stringify(this.productDate.images) == '[]') {
+						this.productDate.images.push({
+							url: imageUrl,
+							mainMark: 1
+						})
+					} else {
+						this.productDate.images.push({
+							url: imageUrl,
+							mainMark: ''
+						})
+					}
 				} else {
-					this.productDate.images.push({
-						url: imageUrl,
-						mainMark: ''
+					uni.showToast({
+						title: '最多只能上传十张图片~',
+						icon: 'none'
 					})
 				}
+
 			},
 			setMainImage(items, index) {
 				let obj = items
@@ -528,6 +546,9 @@
 					url: '/pages/index/index'
 				})
 			},
+			isNumber(value) {
+				return /^[0-9]+$/.test(value);
+			},
 			addCompleted() {
 				if (this.radioItem[0].checked = true) {
 					this.productDate.newMark == '1'
@@ -539,6 +560,109 @@
 				} else {
 					this.productDate.recommend == '2'
 				}
+				if (!this.productDate.attributesTypeId) {
+					uni.showToast({
+						title: '请选择请选择规格',
+						icon: 'none'
+					})
+					return
+				}
+				if(this.attributesList.length==1){
+					if(!this.radioAttributes){
+						uni.showToast({
+							title: '请选择商品规格',
+							icon: 'none'
+						})
+						return
+					}
+				}
+				if(this.attributesList.length>1){
+					if(JSON.stringify(this.checkboxAttributes) == '[]'){
+						uni.showToast({
+							title: '请选择商品规格',
+							icon: 'none'
+						})
+						return
+					}
+				}
+				if (JSON.stringify(this.stockList.length) == '[]') {
+					uni.showToast({ 
+						title: '请选择商品规格',
+						icon: 'none'
+					})
+					return
+				} else {
+					this.stockList.forEach(tab => {
+
+						if (!tab.marketPrice) {
+							uni.showToast({
+								title: '市场价格必填！',
+								icon: 'none'
+							})
+							throw Error(`市场价格必填！`)
+						} else {
+							if (this.isNumber(tab.marketPrice) == false) {
+								uni.showToast({
+									title: '市场价格不是数字！',
+									icon: 'none'
+								})
+								throw Error(`市场价格不是数字！`)
+							}
+						}
+						if (!tab.sellPrice) {
+							uni.showToast({
+								title: '销售价格必填！',
+								icon: 'none'
+							})
+							throw Error(`销售价格必填！`)
+						} else {
+							if (this.isNumber(tab.sellPrice) == false) {
+								uni.showToast({
+									title: '销售价格不是数字！',
+									icon: 'none'
+								})
+								throw Error(`销售价格不是数字！`)
+							}
+						}
+						if (!tab.stock) {
+							uni.showToast({
+								title: '库存数量必填！',
+								icon: 'none'
+							})
+							throw Error(`库存数量必填！`)
+						} else {
+							if (this.isNumber(tab.stock) == false) {
+								uni.showToast({
+									title: '库存数量不是数字！',
+									icon: 'none'
+								})
+								throw Error(`库存数量不是数字！`)
+							}
+						}
+						if (!tab.integral) {
+							uni.showToast({
+								title: '积分价值必填！',
+								icon: 'none'
+							})
+							throw Error(`积分价值必填！`)
+						} else {
+							if (this.isNumber(tab.integral) == false) {
+								uni.showToast({
+									title: '积分价值不是数字！',
+									icon: 'none'
+								})
+								throw Error(`积分价值不是数字！`)
+							}
+						}
+					})
+				}
+				if (JSON.stringify(this.productDate.images) == '[]') {
+					uni.showToast({
+						title: '请上传商品图片',
+						icon: 'none'
+					})
+					return
+				}
 				this.productDate.checkedList = this.checkedList
 				this.productDate.stockList = this.stockList
 				serve.saveProduct(this.productDate).then(res => {
diff --git a/packageIntegral/productList/index.vue b/packageIntegral/productList/index.vue
index a1b0ed8..286d7ac 100644
--- a/packageIntegral/productList/index.vue
+++ b/packageIntegral/productList/index.vue
@@ -31,9 +31,9 @@
 					:style="{background:statusEnum[item.auditStatus].color}">{{statusEnum[item.auditStatus].value}}
 				</view>
 				<view class="footer">
-					<view class="button" @click="orderDelete">删除</view>
+					<view class="button" @click="orderDelete(item)">删除</view>
 					<view class="button" @click="toEditOrder(item)">编辑</view>
-					<view class="button" @click="upDownFrame(item)">{{item.productStatus =='1'?'上架':'下架'}}</view>
+					<view class="button" @click="upDownFrame(item)">{{item.productStatus =='1'?'下架':'上架'}}</view>
 				</view>
 			</view>
 			<view style="height: 30rpx; background: #fff;"></view>
@@ -72,7 +72,7 @@
 				<view class="title">是否删除该商品？</view>
 				<view class="buttons">
 					<view @click="$refs.delete.close()">取消</view>
-					<view>确认</view>
+					<view @click="deleteIntegral">确认</view>
 				</view>
 			</view>
 		</uni-popup>
@@ -167,7 +167,7 @@
 		methods: {
 			selectOptions(index) {
 				this.currentIndex = index
-				console.log(index, 'index')
+				this.paramter.currentPage = 1
 				if (index == 0) {
 					this.paramter.params = {}
 				} else if (index == 1) {
@@ -215,7 +215,7 @@
 			productByPage() {
 				serve.productByPage(this.paramter).then(res => {
 					if (res.code === 20000) {
-						if (!res.data.list.length) {
+						if (!res.data.list.length&&this.paramter.currentPage!=1) {
 							uni.showToast({
 								title: '没有更多订单啦~',
 								icon: 'none'
@@ -241,8 +241,19 @@
 				})
 				this.$refs.detail.open('center')
 			},
-			orderDelete() {
+			orderDelete(item) {
 				this.$refs.delete.open('center')
+				this.deleteData = item
+			},
+			deleteIntegral(){
+				serve.deleteProductById({id:this.deleteData.id}).then(res=>{
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					this.$refs.delete.close()
+					this.search()
+				})
 			},
 			toEditOrder(item) {
 				uni.navigateTo({
diff --git a/packageIntegral/productUpdate/index.vue b/packageIntegral/productUpdate/index.vue
index 4b5748b..6ad39e6 100644
--- a/packageIntegral/productUpdate/index.vue
+++ b/packageIntegral/productUpdate/index.vue
@@ -51,12 +51,12 @@
 
 		<view id="instruction" :class="currentBoxId == 'instruction' ? 'show' : 'hidden'">
 			<uni-forms :modelValue="productDate" label-width="200rpx">
-				<uni-forms-item label="属性类别:">
+				<uni-forms-item label="选择规格:">
 					<uni-data-select v-model="productDate.attributesTypeId" :localdata="attributesTypeList"
-						placeholder="请选择商品品牌" @change="attributesData"></uni-data-select>
+						placeholder="请选择规格" @change="attributesData"></uni-data-select>
 				</uni-forms-item>
 				<view class="content" v-show="productDate.attributesTypeId">
-					<view style="margin: 10rpx 0;">商品类型：</view>
+					<view style="margin: 10rpx 0;">商品规格：</view>
 					<view>
 						<uni-section type="line">
 							<view class="uni-px-5" v-for="(item,index) in attributesList">
@@ -323,16 +323,18 @@
 			checkbox(e) {
 				var index = e; //获取当前点击的下标
 				var checkboxArr = this.radioItem; //选项集合
-				// if (checkboxArr[index].checked) return;//如果点击的当前已选中则返回
-				// checkboxArr.forEach(item => {
-				//  item.checked = false
-				// })
-				if (checkboxArr[index].checked == false) {
-					checkboxArr[index].checked = true; //改变当前选中的checked值
+				if (checkboxArr[index].checked) return; //如果点击的当前已选中则返回
+				checkboxArr.forEach(item => {
+					item.checked = false
+				})
+				checkboxArr[index].checked = true; //改变当前选中的checked值
 
-				} else {
-					checkboxArr[index].checked = false; //改变当前选中的checked值
-				}
+				// if (checkboxArr[index].checked == false) {
+				// 	checkboxArr[index].checked = true; //改变当前选中的checked值
+
+				// } else {
+				// 	checkboxArr[index].checked = false; //改变当前选中的checked值
+				// }
 				if (checkboxArr[0].checked == true) {
 					this.productDate.newMark = 1
 				} else {
@@ -349,6 +351,13 @@
 				let currentFlag = e.currentTarget.id;
 				if (currentFlag == 'next') {
 					this.$refs.productForm.validate().then(res => {
+						if (this.isNumber(this.productDate.price) == false) {
+							uni.showToast({
+								title: '商品售价请输入数字',
+								icon: 'none'
+							})
+							return
+						}
 						switch (currentFlag) {
 							case 'next':
 								this.currentBoxId = 'instruction'
@@ -439,7 +448,7 @@
 				if (this.checkedList.length < index + 1) {
 					this.checkedList.push({
 						attributeId: item.id,
-						checked: this.radioAttributes
+						checked: item.attributesList[index].value
 					})
 				} else {
 					let checked = []
@@ -541,21 +550,28 @@
 							fail(err) {}
 						})
 					},
-					fail() {
-						console.log('相机调用失败')
+					fail(err) {
+						console.log('相机调用失败',err)
 					}
 				})
 			},
 			getImage(imageUrl) {
-				if (JSON.stringify(this.productDate.images) == '[]') {
-					this.productDate.images.push({
-						url: imageUrl,
-						mainMark: 1
-					})
+				if (this.productDate.images.length < 10) {
+					if (JSON.stringify(this.productDate.images) == '[]') {
+						this.productDate.images.push({
+							url: imageUrl,
+							mainMark: 1
+						})
+					} else {
+						this.productDate.images.push({
+							url: imageUrl,
+							mainMark: ''
+						})
+					}
 				} else {
-					this.productDate.images.push({
-						url: imageUrl,
-						mainMark: ''
+					uni.showToast({
+						title: '最多只能上传十张图片~',
+						icon: 'none'
 					})
 				}
 			},
@@ -580,6 +596,9 @@
 			closed() {
 				uni.navigateBack()
 			},
+			isNumber(value) {
+				return /^[0-9]+$/.test(value);
+			},
 			addCompleted() {
 				if (this.radioItem[0].checked = true) {
 					this.productDate.newMark == '1'
@@ -591,6 +610,108 @@
 				} else {
 					this.productDate.recommend == '2'
 				}
+				if(this.attributesList.length==1){
+					if(!this.radioAttributes){
+						uni.showToast({
+							title: '请选择商品规格',
+							icon: 'none'
+						})
+						return
+					}
+				}
+				if(this.attributesList.length>1){
+					if(JSON.stringify(this.checkboxAttributes) == '[]'){
+						uni.showToast({
+							title: '请选择商品规格',
+							icon: 'none'
+						})
+						return
+					}
+				}
+				if (!this.productDate.attributesTypeId) {
+					uni.showToast({
+						title: '请选择规格',
+						icon: 'none'
+					})
+					return
+				}
+				if (JSON.stringify(this.stockList.length) == '[]') {
+					uni.showToast({
+						title: '请选择商品规格',
+						icon: 'none'
+					})
+					return
+				} else {
+					this.stockList.forEach(tab => {
+						if (!tab.marketPrice) {
+							uni.showToast({
+								title: '市场价格必填！',
+								icon: 'none'
+							})
+							throw Error(`市场价格必填！`)
+						} else {
+							if (this.isNumber(tab.marketPrice) == false) {
+								uni.showToast({
+									title: '市场价格不是数字！',
+									icon: 'none'
+								})
+								throw Error(`市场价格不是数字！`)
+							}
+						}
+						if (!tab.sellPrice) {
+							uni.showToast({
+								title: '销售价格必填！',
+								icon: 'none'
+							})
+							throw Error(`销售价格必填！`)
+						} else {
+							if (this.isNumber(tab.sellPrice) == false) {
+								uni.showToast({
+									title: '销售价格不是数字！',
+									icon: 'none'
+								})
+								throw Error(`销售价格不是数字！`)
+							}
+						}
+						if (!tab.stock) {
+							uni.showToast({
+								title: '库存数量必填！',
+								icon: 'none'
+							})
+							throw Error(`库存数量必填！`)
+						} else {
+							if (this.isNumber(tab.stock) == false) {
+								uni.showToast({
+									title: '库存数量不是数字！',
+									icon: 'none'
+								})
+								throw Error(`库存数量不是数字！`)
+							}
+						}
+						if (!tab.integral) {
+							uni.showToast({
+								title: '积分价值必填！',
+								icon: 'none'
+							})
+							throw Error(`积分价值必填！`)
+						} else {
+							if (this.isNumber(tab.integral) == false) {
+								uni.showToast({
+									title: '积分价值不是数字！',
+									icon: 'none'
+								})
+								throw Error(`积分价值不是数字！`)
+							}
+						}
+					})
+				}
+				if (JSON.stringify(this.productDate.images) == '[]') {
+					uni.showToast({
+						title: '请上传商品图片',
+						icon: 'none'
+					})
+					return
+				}
 				this.productDate.checkedList = this.checkedList
 				this.productDate.stockList = this.stockList
 				serve.updateProduct(this.productDate).then(res => {
@@ -598,7 +719,7 @@
 						title: res.msg,
 						icon: 'none'
 					})
-					uni.navigateTo({
+					wx.navigateBack({
 						url: `../productList/index`
 					})
 				})
diff --git a/pages.json b/pages.json
index 74e0572..462adcb 100644
--- a/pages.json
+++ b/pages.json
@@ -91,19 +91,19 @@
 			"pages": [{
 				"path": "takeGoods/index",
 				"style": {}
-			},{
+			}, {
 				"path": "orderDetails/index",
 				"style": {}
-			},{
+			}, {
 				"path": "orderList/index",
 				"style": {}
-			},{
+			}, {
 				"path": "productList/index",
 				"style": {}
-			},{
+			}, {
 				"path": "productAddition/index",
 				"style": {}
-			},{
+			}, {
 				"path": "productUpdate/index",
 				"style": {}
 			}]
@@ -119,7 +119,13 @@
 					"style": {}
 				}, {
 					"path": "components/autograph",
-					"style": {}
+					"style": {
+						"navigationBarTitleText": "签字",
+						"enablePullDownRefresh": false,
+						"pageOrientation": "landscape",
+						"backgroundColor": "#f8f8f8",
+						"navigationStyle": "custom"
+					}
 				}
 			]
 		},
@@ -299,4 +305,4 @@
 	}
 
 
-}
+}
\ No newline at end of file
-- 
2.49.1


From 2796a734f6d3e6c6838e52bed5a6281318a3c1fa Mon Sep 17 00:00:00 2001
From: zhangyouji <zhangyouji@sdxkhlw.cn>
Date: Wed, 17 Apr 2024 15:18:22 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=8D=95=E9=80=89=E6=94=B9=E5=A4=9A=E9=80=89=EF=BC=8C=E7=94=B5?=
 =?UTF-8?q?=E5=AD=90=E5=AF=B9=E8=B4=A6=E5=8D=95=E9=99=90=E5=88=B6=E5=88=B0?=
 =?UTF-8?q?=E6=B2=B9=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageElectron/index.vue                 |  14 +-
 packageIntegral/productAddition/index.vue | 166 +++++++++-----------
 packageIntegral/productUpdate/index.vue   | 175 +++++++++-------------
 3 files changed, 148 insertions(+), 207 deletions(-)

diff --git a/packageElectron/index.vue b/packageElectron/index.vue
index e991e75..3803aac 100644
--- a/packageElectron/index.vue
+++ b/packageElectron/index.vue
@@ -48,7 +48,9 @@
 				paramter: {
 					currentPage: 1,
 					pagesize: 20,
-					params: {},
+					params: {
+						siteId: uni.getStorageSync('oilSitePriceId')
+					},
 				},
 				dataList: [],
 				optionsList: [{
@@ -63,7 +65,7 @@
 				}, {
 					text: '金额异常',
 					value: ''
-				}],
+				}]
 		
 		
 			}
@@ -77,22 +79,22 @@
 			selectOptions(index) {
 				this.currentIndex = index
 				this.paramter.currentPage = 1
+				this.paramter.params ={
+					siteId: uni.getStorageSync('oilSitePriceId')
+				}
 				if(index == 0){
-					this.paramter.params ={}
 					this.paramter.params.status = '5'
 				}else if(index ==1){
-					this.paramter.params ={}
 					this.paramter.params.status = '1'
 				}else if(index ==2){
-					this.paramter.params ={}
 					this.paramter.params.status = '2'
 				}else if(index ==3){
-					this.paramter.params ={}
 					this.paramter.params.status = '3'
 				}
 				this.getByPage()
 			},
 			getByPage(){
+				// this.parameter.params.siteId = this.siteId
 				serve.getByPage(this.paramter).then(res=>{
 					if (res.code === 20000) {
 						if (!res.data.list.length&&this.paramter.currentPage!=1) {
diff --git a/packageIntegral/productAddition/index.vue b/packageIntegral/productAddition/index.vue
index 7df9313..dc32b42 100644
--- a/packageIntegral/productAddition/index.vue
+++ b/packageIntegral/productAddition/index.vue
@@ -62,10 +62,8 @@
 							<view class="uni-px-5" v-for="(item,index) in attributesList">
 								<view style="display: inline-block;">{{item.attributeName}}：</view>
 								<view style="display: inline-block;">
-									<uni-data-checkbox v-if="index==0" mode="tag" @change="changeRadio(item,index)"
-										v-model="radioAttributes" :localdata="item.attributesList"></uni-data-checkbox>
-									<uni-data-checkbox v-else-if="index!=0" mode="tag"
-										@change="changeCheckBox(item,index)" multiple v-model="checkboxAttributes"
+									<uni-data-checkbox  mode="tag"
+										@change="changeCheckBox(item,index)" multiple v-model="item.checkboxAttributes"
 										:localdata="item.attributesList"></uni-data-checkbox>
 								</view>
 
@@ -95,9 +93,10 @@
 					<view style="margin: 10rpx 0;">
 						<text style="color: red;">*</text>
 						<text>规格：</text>
-						<text v-if="checkboxAttributes.length==0">{{radioAttributes}}</text>
-						<text
-							v-if="checkboxAttributes.length>0">{{radioAttributes}}+{{checkboxAttributes[index]}}</text>
+						<text v-for="(value,key,index) in JSON.parse(items.attributeJson)">
+						<text v-if="index==0">{{value}}</text>
+						<text v-else> + {{value}}</text>
+						</text>
 					</view>
 					<view class="tagButton">
 						<input type="text" v-model="items.marketPrice" placeholder="市场价格" />
@@ -139,10 +138,6 @@
 					</view>
 
 				</view>
-				<!-- <view>
-					<view>详情图片：<text style="color: #999999;">最多可上传10张图片</text></view>
-					<view></view>
-				</view> -->
 			</uni-forms>
 			<view class="buttons">
 				<view id="previous" @click="changeBox">上一步</view>
@@ -216,8 +211,7 @@
 					stock: '',
 					integral: ''
 				}],
-				radioAttributes: '',
-				checkboxAttributes: [],
+
 				stockList: [],
 				checkedList: []
 			}
@@ -275,12 +269,6 @@
 				})
 				checkboxArr[index].checked = true; //改变当前选中的checked值
 
-				// if (checkboxArr[index].checked == false) {
-				// 	checkboxArr[index].checked = true; //改变当前选中的checked值
-
-				// } else {
-				// 	checkboxArr[index].checked = false; //改变当前选中的checked值
-				// }
 				if (checkboxArr[0].checked == true) {
 					this.productDate.newMark = 1
 				} else {
@@ -355,14 +343,13 @@
 					integral: ''
 				}]
 				this.stockList = []
-				this.radioAttributes = ''
-				this.checkboxAttributes = []
 				if (this.productDate.attributesTypeId) {
 					this.attributesTypeList.forEach(tab => {
 						if (tab.value == this.productDate.attributesTypeId) {
 							this.attributesList = tab.attributesList
 							this.attributesList.forEach(tab => {
 								tab.attributesList = []
+								tab.checkboxAttributes=[]
 								tab.attributeContent.split(',').forEach(item => {
 									tab.attributesList.push({
 										value: item,
@@ -378,34 +365,53 @@
 				}
 
 			},
-			changeRadio(item, index) {
-				if (JSON.stringify(this.checkedList) == '[]') {
-					this.checkedList.push({
-						attributeId: item.id,
-						checked: this.radioAttributes
-					})
-				} else {
-					this.checkedList[index].checked = this.radioAttributes
-				}
-				this.stockCheck()
-			},
 			changeCheckBox(item, index) {
 				if (this.checkedList.length < index + 1) {
 					this.checkedList.push({
 						attributeId: item.id,
-						checked: item.attributesList[index].value
+						checked: item.checkboxAttributes[index]
 					})
 				} else {
 					let checked = []
-					this.checkboxAttributes.forEach(tab => {
+					item.checkboxAttributes.forEach(tab => {
 						checked.push(tab)
 					})
 					this.checkedList[index].checked = checked.join(',')
-					this.checkedList.checked
 				}
-				this.stockCheck()
+				let arrays = []
+				this.attributesList.forEach(tab=>{
+					arrays.push(tab.checkboxAttributes)
+				})
+				let arrList = this.combineArrays(arrays)
+				this.stockCheck(arrList)
 			},
-			stockCheck() {
+			combineArrays(arr) {
+			  if (arr.length === 0) {
+			    return [];
+			  } else if (arr.length === 1) {
+			    return arr[0];
+			  } else if (arr.length === 2 && JSON.stringify(arr[1])=='[]') {
+				let result = [];
+				arr[0].forEach(tab=>{
+					result.push([tab])
+				})
+				return result;
+			  } else {
+			    let result = [];
+			    let subCombinations = this.combineArrays(arr.slice(1));
+			    for (let elem of arr[0]) {
+			      if (Array.isArray(subCombinations)) {
+			        for (let subComb of subCombinations) {
+			          result.push([elem].concat(subComb));
+			        }
+			      } else {
+			        result.push([elem, subCombinations]);
+			      }
+			    }
+			    return result;
+			  }
+			},
+			stockCheck(arrList) {
 				this.stockList = []
 				let obj = {
 					marketPrice: '',
@@ -413,46 +419,23 @@
 					stock: '',
 					integral: ''
 				}
-				if (this.attributesList.length == 1) {
+				arrList.forEach(tab=>{
 					let data = {}
-					let name = this.attributesList[0].attributeName
-					let value = this.radioAttributes
-					data[name] = value
-					obj.attributeJson = JSON.stringify(data)
-					this.stockList.push(obj)
-				} else {
-					this.attributesList.forEach((item, ind) => {
-						if (ind != 0) {
-							this.checkboxAttributes.forEach((tab, index) => {
-								let data = {}
-								let tabName = this.attributesList[ind].attributeName
-								let tabValue = tab
-								data[tabName] = tabValue
-								obj.attributeJson = JSON.stringify(data)
-								let stockObj = JSON.parse(JSON.stringify(obj))
-								this.stockList.push(stockObj)
-							})
-						}
+					let tabName = ''
+					let tabValue = ''
+					tab.forEach((item,i)=>{
+						tabName = this.attributesList[i].attributeName
+						tabValue = item
+						data[tabName] = tabValue
 					})
-
-
-				}
+					obj.attributeJson = JSON.stringify(data)
+					let stockObj = JSON.parse(JSON.stringify(obj))
+					this.stockList.push(stockObj)
+				})
 			},
 			deleteCheckAll(i) {
-				if (this.checkboxAttributes.length > 1) {
-					this.checkboxAttributes.splice(i, 1)
-				} else {
-					this.checkboxAttributes.splice(i, 1)
-					this.radioAttributes = ''
-				}
 				this.stockList.splice(i, 1)
 			},
-			deleteRadio() {
-				this.radioAttributes = ''
-			},
-			changeChecked(item) {
-				item.checked = !item.checked
-			},
 			addStockList() {
 				this.stockList.forEach(tab => {
 					tab.marketPrice = this.bottonList[0].marketPrice
@@ -550,16 +533,16 @@
 				return /^[0-9]+$/.test(value);
 			},
 			addCompleted() {
-				if (this.radioItem[0].checked = true) {
-					this.productDate.newMark == '1'
-				} else {
-					this.productDate.newMark == '2'
-				}
-				if (this.radioItem[1].checked = true) {
-					this.productDate.recommend == '1'
-				} else {
-					this.productDate.recommend == '2'
-				}
+        if (this.radioItem[0].checked = true) {
+          this.productDate.newMark == 1
+        } else {
+          this.productDate.newMark == 2
+        }
+        if (this.radioItem[1].checked = true) {
+          this.productDate.recommend == 1
+        } else {
+          this.productDate.recommend == 2
+        }
 				if (!this.productDate.attributesTypeId) {
 					uni.showToast({
 						title: '请选择请选择规格',
@@ -567,26 +550,17 @@
 					})
 					return
 				}
-				if(this.attributesList.length==1){
-					if(!this.radioAttributes){
+				this.attributesList.forEach(tab=>{
+					if(JSON.stringify(tab.checkboxAttributes) == '[]'){
 						uni.showToast({
 							title: '请选择商品规格',
 							icon: 'none'
 						})
-						return
+						throw Error(`请选择商品规格！`)
 					}
-				}
-				if(this.attributesList.length>1){
-					if(JSON.stringify(this.checkboxAttributes) == '[]'){
-						uni.showToast({
-							title: '请选择商品规格',
-							icon: 'none'
-						})
-						return
-					}
-				}
+				})
 				if (JSON.stringify(this.stockList.length) == '[]') {
-					uni.showToast({ 
+					uni.showToast({
 						title: '请选择商品规格',
 						icon: 'none'
 					})
@@ -926,4 +900,4 @@
 	.hidden {
 		display: none;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/packageIntegral/productUpdate/index.vue b/packageIntegral/productUpdate/index.vue
index 6ad39e6..19421c4 100644
--- a/packageIntegral/productUpdate/index.vue
+++ b/packageIntegral/productUpdate/index.vue
@@ -62,10 +62,8 @@
 							<view class="uni-px-5" v-for="(item,index) in attributesList">
 								<view style="display: inline-block;">{{item.attributeName}}：</view>
 								<view style="display: inline-block;">
-									<uni-data-checkbox v-if="index==0" mode="tag" @change="changeRadio(item,index)"
-										v-model="radioAttributes" :localdata="item.attributesList"></uni-data-checkbox>
-									<uni-data-checkbox v-else-if="index!=0" mode="tag"
-										@change="changeCheckBox(item,index)" multiple v-model="checkboxAttributes"
+									<uni-data-checkbox mode="tag" @change="changeCheckBox(item,index)" multiple
+										v-model="item.checkboxAttributes"
 										:localdata="item.attributesList"></uni-data-checkbox>
 								</view>
 
@@ -98,9 +96,10 @@
 					<view style="margin: 10rpx 0;">
 						<text style="color: red;">*</text>
 						<text>规格：</text>
-						<text v-if="checkboxAttributes.length==0">{{radioAttributes}}</text>
-						<text
-							v-if="checkboxAttributes.length>0">{{radioAttributes}}+{{checkboxAttributes[index]}}</text>
+						<text v-for="(value,key,index) in JSON.parse(tab.attributeJson)">
+							<text v-if="index==0">{{value}}</text>
+							<text v-else> + {{value}}</text>
+						</text>
 					</view>
 					<view class="tagButton">
 						<input type="text" v-model="tab.marketPrice" placeholder="市场价格" />
@@ -142,10 +141,6 @@
 					</view>
 
 				</view>
-				<!-- <view>
-					<view>详情图片：<text style="color: #999999;">最多可上传10张图片</text></view>
-					<view></view>
-				</view> -->
 			</uni-forms>
 			<view class="buttons">
 				<view id="previous" @click="changeBox">上一步</view>
@@ -218,8 +213,7 @@
 					stock: '',
 					integral: ''
 				}],
-				radioAttributes: '',
-				checkboxAttributes: [],
+
 				stockList: [],
 				checkedList: []
 			}
@@ -260,11 +254,12 @@
 						} else {
 							this.radioItem[1].checked = false
 						}
-						this.attributesTypeList.forEach(tab => {
-							if (tab.value == this.productDate.attributesTypeId) {
-								this.attributesList = tab.attributesList
+						this.attributesTypeList.forEach(tabs => {
+							if (tabs.value == this.productDate.attributesTypeId) {
+								this.attributesList = tabs.attributesList
 								this.attributesList.forEach(tab => {
 									tab.attributesList = []
+									tab.checkboxAttributes = []
 									tab.attributeContent.split(',').forEach(item => {
 										tab.attributesList.push({
 											value: item,
@@ -275,21 +270,9 @@
 							}
 						})
 						this.checkedList = this.productDate.checkedList
-						if (this.productDate.checkedList.length == 1) {
-							this.radioAttributes = this.productDate.checkedList[0].checked
-						} else {
-							this.checkboxAttributes = []
-							this.productDate.checkedList.forEach((tab, index) => {
-								if (index == 0) {
-									this.radioAttributes = this.productDate.checkedList[0].checked
-								} else {
-									tab.checked.split(',').forEach(item => {
-										this.checkboxAttributes.push(item)
-									})
-
-								}
-							})
-						}
+						this.productDate.checkedList.forEach((tab, index) => {
+							this.attributesList[index].checkboxAttributes = tab.checked.split(',')
+						})
 						this.stockList = this.productDate.stockList
 
 
@@ -329,12 +312,6 @@
 				})
 				checkboxArr[index].checked = true; //改变当前选中的checked值
 
-				// if (checkboxArr[index].checked == false) {
-				// 	checkboxArr[index].checked = true; //改变当前选中的checked值
-
-				// } else {
-				// 	checkboxArr[index].checked = false; //改变当前选中的checked值
-				// }
 				if (checkboxArr[0].checked == true) {
 					this.productDate.newMark = 1
 				} else {
@@ -409,14 +386,13 @@
 					integral: ''
 				}]
 				this.stockList = []
-				this.radioAttributes = ''
-				this.checkboxAttributes = []
 				if (this.productDate.attributesTypeId) {
 					this.attributesTypeList.forEach(tab => {
 						if (tab.value == this.productDate.attributesTypeId) {
 							this.attributesList = tab.attributesList
 							this.attributesList.forEach(tab => {
 								tab.attributesList = []
+								tab.checkboxAttributes = []
 								tab.attributeContent.split(',').forEach(item => {
 									tab.attributesList.push({
 										value: item,
@@ -431,37 +407,55 @@
 					this.attributesList = []
 				}
 
-			},
-			changeRadio(item, index) {
-				if (JSON.stringify(this.checkedList) == '[]') {
-					this.checkedList.push({
-						attributeId: item.id,
-						checked: this.radioAttributes
-					})
-				} else {
-					this.checkedList[index].checked = this.radioAttributes
-				}
-				this.stockCheck()
-
 			},
 			changeCheckBox(item, index) {
 				if (this.checkedList.length < index + 1) {
 					this.checkedList.push({
 						attributeId: item.id,
-						checked: item.attributesList[index].value
+						checked: item.checkboxAttributes[index]
 					})
 				} else {
 					let checked = []
-					this.checkboxAttributes.forEach(tab => {
+					item.checkboxAttributes.forEach(tab => {
 						checked.push(tab)
 					})
 					this.checkedList[index].checked = checked.join(',')
-					this.checkedList.checked
 				}
-				this.stockCheck()
+				let arrays = []
+				this.attributesList.forEach(tab => {
+					arrays.push(tab.checkboxAttributes)
+				})
+				let arrList = this.combineArrays(arrays)
+				this.stockCheck(arrList)
 
 			},
-			stockCheck() {
+			combineArrays(arr) {
+				if (arr.length === 0) {
+					return [];
+				} else if (arr.length === 1) {
+					return arr[0];
+				} else if (arr.length === 2 && JSON.stringify(arr[1]) == '[]') {
+					let result = [];
+					arr[0].forEach(tab => {
+						result.push([tab])
+					})
+					return result;
+				} else {
+					let result = [];
+					let subCombinations = this.combineArrays(arr.slice(1));
+					for (let elem of arr[0]) {
+						if (Array.isArray(subCombinations)) {
+							for (let subComb of subCombinations) {
+								result.push([elem].concat(subComb));
+							}
+						} else {
+							result.push([elem, subCombinations]);
+						}
+					}
+					return result;
+				}
+			},
+			stockCheck(arrList) {
 				this.stockList = []
 				let obj = {
 					marketPrice: '',
@@ -469,43 +463,23 @@
 					stock: '',
 					integral: ''
 				}
-				if (this.attributesList.length == 1) {
+				arrList.forEach(tab => {
 					let data = {}
-					let name = this.attributesList[0].attributeName
-					let value = this.radioAttributes
-					data[name] = value
-					obj.attributeJson = JSON.stringify(data)
-					this.stockList.push(obj)
-				} else {
-					this.attributesList.forEach((item, ind) => {
-						if (ind != 0) {
-							this.checkboxAttributes.forEach((tab, index) => {
-								let data = {}
-								let tabName = this.attributesList[ind].attributeName
-								let tabValue = tab
-								data[tabName] = tabValue
-								obj.attributeJson = JSON.stringify(data)
-								let stockObj = JSON.parse(JSON.stringify(obj))
-								this.stockList.push(stockObj)
-							})
-						}
+					let tabName = ''
+					let tabValue = ''
+					tab.forEach((item, i) => {
+						tabName = this.attributesList[i].attributeName
+						tabValue = item
+						data[tabName] = tabValue
 					})
-
-
-				}
+					obj.attributeJson = JSON.stringify(data)
+					let stockObj = JSON.parse(JSON.stringify(obj))
+					this.stockList.push(stockObj)
+				})
 			},
 			deleteCheckAll(i) {
-				if (this.checkboxAttributes.length > 1) {
-					this.checkboxAttributes.splice(i, 1)
-				} else {
-					this.checkboxAttributes.splice(i, 1)
-					this.radioAttributes = ''
-				}
 				this.stockList.splice(i, 1)
 			},
-			deleteRadio() {
-				this.radioAttributes = ''
-			},
 			addStockList() {
 				this.stockList.forEach(tab => {
 					tab.marketPrice = this.bottonList[0].marketPrice
@@ -551,7 +525,7 @@
 						})
 					},
 					fail(err) {
-						console.log('相机调用失败',err)
+						console.log('相机调用失败', err)
 					}
 				})
 			},
@@ -601,33 +575,24 @@
 			},
 			addCompleted() {
 				if (this.radioItem[0].checked = true) {
-					this.productDate.newMark == '1'
+					this.productDate.newMark == 1
 				} else {
-					this.productDate.newMark == '2'
+					this.productDate.newMark == 2
 				}
 				if (this.radioItem[1].checked = true) {
-					this.productDate.recommend == '1'
+					this.productDate.recommend == 1
 				} else {
-					this.productDate.recommend == '2'
+					this.productDate.recommend == 2
 				}
-				if(this.attributesList.length==1){
-					if(!this.radioAttributes){
+				this.attributesList.forEach(tab => {
+					if (JSON.stringify(tab.checkboxAttributes) == '[]') {
 						uni.showToast({
 							title: '请选择商品规格',
 							icon: 'none'
 						})
-						return
+						throw Error(`请选择商品规格！`)
 					}
-				}
-				if(this.attributesList.length>1){
-					if(JSON.stringify(this.checkboxAttributes) == '[]'){
-						uni.showToast({
-							title: '请选择商品规格',
-							icon: 'none'
-						})
-						return
-					}
-				}
+				})
 				if (!this.productDate.attributesTypeId) {
 					uni.showToast({
 						title: '请选择规格',
-- 
2.49.1