'最新版本'

杨鑫
1 parent 1a01e014
Showing 12 changed files with 135 additions and 53 deletions
lvdao-miniapp/pages/accepting/accepting.vue
lvdao-miniapp/pages/complaint/complaint.vue
lvdao-miniapp/pages/record/record.vue
lvdao-miniapp/pages/repair/repair.vue
lvdao-miniapp/pages/serve/jiDed.vue
lvdao-miniapp/pages/serve/serve.vue
wenjuan-h5/config/api.js
wenjuan-h5/pages_category_page1/question/question.vue
wenjuan-pc/src/components/dajuanTongji/index.vue
wenjuan-pc/src/main.js
wenjuan-pc/src/utils/request.js
wenjuan-pc/src/views/investigation/index.vue
@@ -4,7 +4,7 @@
 		<view class="record-list">
 			<view class="good-item">
 				<view class="img">
-					<u-image width="100%" height="100%" :src="record.cereBasicInformationShop&&record.cereBasicInformationShop.displayMainImage?$img + record.cereBasicInformationShop.displayMainImage:record.cereBasicInformationVenue&&record.cereBasicInformationVenue.displayImage?$img + record.cereBasicInformationVenue.displayImage:record.cereAdvertisingInformation&&record.cereAdvertisingInformation.locationDiagram?$img + record.cereAdvertisingInformation.locationDiagram:''"></u-image>
+					<u-image width="100%" height="100%" border-radius="10" :src="record.cereBasicInformationShop&&record.cereBasicInformationShop.displayMainImage?$img + record.cereBasicInformationShop.displayMainImage:record.cereBasicInformationVenue&&record.cereBasicInformationVenue.displayImage?$img + record.cereBasicInformationVenue.displayImage:record.cereAdvertisingInformation&&record.cereAdvertisingInformation.locationDiagram?$img + record.cereAdvertisingInformation.locationDiagram:''"></u-image>
 				</view>
 				<view class="info">
 					<view class="title">{{
@@ -143,13 +143,15 @@
 					}
 				this.ruleForm.applicationTime = this.currentTime()
 				this.ruleForm.createUser = uni.getStorageSync('user').phone
-				this.ruleForm.onSitePhoto.map(item=>{
-					item.replace(this.$img,'')
+		this.ruleForm.onSitePhoto = this.ruleForm.onSitePhoto.map(item=>{
+					 return item.replace(this.$img,'');
 				})
+				
 						let info = {
 							...this.ruleForm,
 							onSitePhoto:this.ruleForm.onSitePhoto.join(','),
 						}
+			
 							this.$http.sendRequest('/cereComplaintsSuggestions/add', 'POST',info,1).then(res => {
 								uni.navigateTo({
 									url: '/pages/serve/serve'
@@ -28,20 +28,21 @@
 			return {
 				recordList:'',
 				pageindex: {
+					auditStatus:1,
 					pageNumber: 0,
 					pageSize: 10
 				},
 				activesType: [
 					{
-					value: 0,
-					label: '商铺申请记录'
-				},{
 					value: 1,
-					label: '场地申请记录'
+					label: '待审核'
+				},{
+					value:2,
+					label: '待签约'
 				},
 				{
-					value: 2,
-					label: '广告位申请记录'
+					value: 3,
+					label: '已驳回'
 				}
 				],
 				typeShow:false,
@@ -71,19 +72,9 @@
 				 })
 			},
 			typeChange(e) {
-				
 				this.pageindex.start = e[0].labels
-				if(e[0].value == 2){
-					this.$http.sendRequest('/cereAdvertiserInfo/queryByPage', 'POST', this.pageindex, 1).then(item => {
-					this.recordList =  item.data.data.content
-					})
-				}else{
-					this.$http.sendRequest('/cereBusinessInfo/queryByPage', 'POST', this.pageindex,1).then(res => {
-						this.recordList =  res.data.data.content
-						})
-				}
-					
-				this.getALL()
+				this.pageindex.auditStatus = e[0].value
+					this.getALL()
 			},
 		}
 	}
@@ -5,7 +5,7 @@
 				<view class="feedback-data">
 					<view>
 						<view class="title">
-							<text style="font-weight: bold;">现场照片</text>
+							<text style="font-weight: bold;">*现场照片</text>
 						</view>
 					</view>
@@ -23,8 +23,8 @@
 				<view class="add-list">
 					<view class="list">
 						<view class="title">
-							<text style="font-weight: bold;">设备名称</text>
-							<!-- <text class="star">*</text> -->
+							<text style="font-weight: bold;">*设备名称</text>
+							
 						</view>
 						<view class="content">
 							<input type="text" placeholder="请输入" v-model="ruleForm.deviceName">
@@ -32,8 +32,8 @@
 					</view>
 					<view class="list">
 						<view class="title">
-							<text style="font-weight: bold;">设备类型</text>
-							<!-- <text class="star">*</text> -->
+							<text style="font-weight: bold;">*设备类型</text>
+							
 						</view>
 						<view class="content"  @click="choose(1)" style="width: 25%;">
 							<u-input v-model="ruleForm.deviceType" type="select" disabledColor="#ffffff"
@@ -43,8 +43,8 @@
 					</view>
 					<view class="list">
 						<view class="title">
-							<text style="font-weight: bold;">保修问题</text>
-							<!-- <text class="star">*</text> -->
+							<text style="font-weight: bold;">*保修问题</text>
+							
 						</view>
 						<view class="content" @click="chooseLocation(1)" style="width: 25%;">
 							<u-input v-model="ruleForm.warrantyIssue" type="select" disabledColor="#ffffff"
@@ -65,8 +65,8 @@
 				<view class="feedback-data">
 					<view>
 						<view class="title">
-							<text style="font-weight: bold;">备注信息</text>
-							<!-- <text class="star">*</text> -->
+							<text style="font-weight: bold;">*备注信息</text>
+							
 						</view>
 					</view>
 					<view class="voucher-img">
@@ -94,7 +94,7 @@
 			return {
 				fileList:[],
 				ruleForm:{
-					onSitePhoto:'',
+					onSitePhoto:[],
 					deviceName:'',
 					deviceType:'',
 					warrantyIssue:'',
@@ -140,13 +140,58 @@
 			pops1(val) {
 				this.ruleForm.deviceType =  val[0].label
 			},
+			check(){
+						if (this.ruleForm.onSitePhoto.length== 0) {
+							uni.showToast({
+								icon: 'none',
+								title: '请上传现场图片'
+							});
+							return false;
+						}
+						if (!this.ruleForm.deviceName) {
+							uni.showToast({
+								icon: 'none',
+								title: '请输入设备名称'
+							});
+							return false;
+						}
+						if (!this.ruleForm.deviceType) {
+							uni.showToast({
+								icon: 'none',
+								title: '请选择设备类型'
+							});
+							return false;
+						}
+						if (!this.ruleForm.warrantyIssue) {
+							uni.showToast({
+								icon: 'none',
+								title: '请选择保修问题'
+							});
+							return false;
+						}
+						if (!this.ruleForm.memo) {
+							uni.showToast({
+								icon: 'none',
+								title: '请输入备注信息'
+							});
+							return false;
+						}
+				
+					return true;
+			},
 			submit() {
-							
+							let show = this.check()
+								if(show == false){
+									return
+								}
 							this.ruleForm.applicationTime = this.currentTime()
 							this.ruleForm.createUser = uni.getStorageSync('user').phone
+							this.ruleForm.onSitePhoto = this.ruleForm.onSitePhoto.map(item=>{
+										 return item.replace(this.$img,'');
+									})
 									let info = {
 										...this.ruleForm,
-										onSitePhoto:this.ruleForm.onSitePhoto.replace(this.$img,''),
+										onSitePhoto:this.ruleForm.onSitePhoto.join(','),
 									}
 							this.$http.sendRequest('/cereReportIssuesRepairs/add', 'POST',info,1).then(res => {
 							     uni.navigateTo({
@@ -189,7 +234,7 @@
 									filePath: 'xcx', // 其他表单数据
 								},
 								success: (uploadFileRes) => {
-										this.ruleForm.onSitePhoto= this.$img + JSON.parse(uploadFileRes.data).data
+										this.ruleForm.onSitePhoto.push(this.$img + JSON.parse(uploadFileRes.data).data)
 									uni.showToast({
 										title: '上传成功',
 										icon: 'success',
@@ -17,7 +17,10 @@
 				<view class="label">备注信息</view>
 				<text>{{record.memo || record.remark}}</text>
 			</view>
-
+				<view style="padding: 5px 0;line-height: 36px;">现场照片</view>
+			<view class="imgList">
+				<u-image width="48%" height="280" border-radius="10" :src="$img+item" v-for="(item,index) in this.record.onSitePhoto"></u-image>
+			</view>
 		</view>
@@ -35,6 +38,9 @@
 		    const item = JSON.parse(decodeURIComponent(options.item));
 		    console.log('Received item:', item);
 			this.record = item
+			if(typeof this.record.onSitePhoto == 'string'){
+				this.record.onSitePhoto = 	this.record.onSitePhoto.split(',')
+			}
 		  },
 		methods: {
@@ -103,7 +109,7 @@
 		}
 	}
 	.msglist{
-		padding: 0 30rpx;
+		padding: 0 30rpx 20rpx 30rpx;
 		background-color: #Fff;
 		border-radius: 14rpx;
 		margin-bottom: 20rpx;
@@ -193,4 +199,9 @@
 			}
 		}
 	}
+	.imgList{
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+	}
 </style> 
@@ -25,6 +25,9 @@
 					</view>
 					<view class="info-item">申请时间：{{item.applicationTime}}</view>
 					<view class="info-item">状态：<span style="color: #0FBB59;">{{item.status=='1'?'受理中':'已完成'}}</span></view>
+					<view style="margin-top: 10px;">
+						<u-button type="success" style="width:30%;height: 28px;margin: 0 10px 0 0;" @click="submit">评价</u-button>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -88,6 +91,9 @@
 					})
 				}
 			},
+			submit(){
+				
+			}
 		}
 	}
 </script>
 // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/admin-server'
 // const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/api'
-let DOMAIN_PREFIXPING = 'http://172.16.61.125:9003' 
-let DOMAIN_PREFIX = 'http://172.16.61.125:9007'
+// let DOMAIN_PREFIXPING = 'http://172.16.61.125:9003' 
+// let DOMAIN_PREFIX = 'http://172.16.61.125:9007'
 // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/meserver/admin-server'
@@ -14,14 +14,14 @@ let DOMAIN_PREFIX = &#39;http://172.16.61.125:9007&#39;
 // const DOMAIN_PREFIXPING = `${host}/cdwlMall/admin-server`
 // const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` 
-// const DOMAIN_PREFIXPING = `http://192.168.2.152:9003`
-// const DOMAIN_PREFIX = 'http://192.168.2.152:9007'
+let DOMAIN_PREFIXPING = `http://10.0.0.41:9003`
+let DOMAIN_PREFIX = 'http://10.0.0.41:9007'
 let host = window.location.host;
 let hostall = window.location.href;
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
-  DOMAIN_PREFIXPING = 'http://172.16.61.124:9003'
-  DOMAIN_PREFIX = 'http://172.16.61.124:9007'
+  // DOMAIN_PREFIXPING = `http://10.0.0.41:9003`
+  // DOMAIN_PREFIX = 'http://10.0.0.41:9007'
 } else {
   let c1 = hostall.split('cdwlMall')[0];
    DOMAIN_PREFIXPING = `${c1}/cdwlMall/admin-server`
@@ -600,6 +600,7 @@
 					}
 				}
 				const result = Object.keys(obj.question).reduce((acc, key1) => {
+					console.log(obj.question[key])
 					const question = obj.question[key];
 					let chooseAnswers = []
 					if (!Array.isArray(question.choose)) {
@@ -681,8 +682,7 @@
 					question: obj.question
 				}
-				console.log(tijiaoObj)
-
+	
 				NET.request(API.wenjuanUp, tijiaoObj, 'post').then(res => {
 					// this.show =true
@@ -747,9 +747,11 @@
 						if (res.answer == chooseItem.answer) {
 							console.error('；；',chooseItem.answer)
 							this.wenjuan.question[key].choose = chooseItem.answer
+							console.log('；；',this.wenjuan.question[key].choose)
 						}
 					})
 				}
+				
 				// console.error({
 				// 	...this.myChoose 
 				// })
@@ -761,6 +763,7 @@
 				// 	...chooseItem
 				// }
 				chooseItem.disabled = true
+				console.error(options, chooseItem, idx)
 			},
 			chooseAnswer(val,idx,item,index) {
 				console.log(val,idx,item,index)
@@ -160,9 +160,9 @@ export default {
     }
   },
   mounted () {
-    this.loadQuestionByIndex(this.index)
-    this.tubiao()
-    console.log(JSON.parse(this.obj))
+    // this.loadQuestionByIndex(this.index)
+    // this.tubiao()
+
     // this.processData()
   },
   onload () {
@@ -183,7 +183,7 @@ export default {
   methods: {
     init (data) {
       this.tableData = data;
-      // console.log('initdata',data);
+
       this.loadQuestionByIndex(this.index)
       this.tubiao()
     },
@@ -195,8 +195,13 @@ export default {
       } = this.tableData;
       var list = []; // 用于存储结果
+        var table =null
+      if(typeof cereQuestionnaireTable.question == 'string'){
+      table = JSON.parse(cereQuestionnaireTable.question); // 解析问卷中的问题数据
+      }else{
+        table = cereQuestionnaireTable.question
+      }
-      var table = JSON.parse(cereQuestionnaireTable.question); // 解析问卷中的问题数据
       // 遍历 groupKeys 中的每个条目
       // for (let i = 0; i < groupKeys.length; i++) {
@@ -322,6 +327,7 @@ export default {
       this.tiList = [];
       this.tiList = optionlist
+      this.tiList = optionlist.filter(item => typeof item.title === 'string' && item.title.trim() !== '');
     },
     // 初始化选项统计，确保每个选项都有统计数据
     initOptionStats (optionSettings) {
@@ -342,6 +348,7 @@ export default {
     },
     tubiao () {
+
       const res = this.tiList.map(function (item) {
         return {
           name: item.title,
@@ -29,8 +29,8 @@ Vue.prototype.$echarts = echarts
 // Vue.prototype.$API = '/cdwlMall/meserver/api'
 // Vue.prototype.$API = 'https://h5.028wlkj.com/cdwlMall/meserver/api'
 // Vue.prototype.$hostUrl = 'https://h5.028wlkj.com/cdwlMall/'
-// Vue.prototype.$API = 'http://192.168.2.225:9007'
-Vue.prototype.$API = process.env.VUE_APP_DOMAIN_PREFIX_2
+Vue.prototype.$API = 'http://172.16.61.123/cdwlMall/meserver/api'
+// Vue.prototype.$API = process.env.VUE_APP_DOMAIN_PREFIX_2
 Vue.prototype.$hostUrl = `${window.location.protocol}//${window.location.host}/cdwlMall`
@@ -21,7 +21,8 @@ let hostall = window.location.href;
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
-  baseURL = 'http://172.16.61.125:9003';
+  baseURL = 'http://10.0.0.41:9003';
+  // baseURL = 'http://172.16.61.125:9003';
   // baseURL = 'http://172.16.61.125:9003';
   // baseURL = 'http://192.168.2.36:9003';
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
@@ -244,7 +244,7 @@
                       </el-checkbox-group>
                       <div v-if="item.type == '文本'" style="display: flex;flex-direction: column;">
-                        {{ item.choose }}
+                        {{ item.choose}}
                       </div>
                     </div>
@@ -2120,6 +2120,22 @@ export default {
       if (typeof this.daxiangData.question === 'string') {
         this.daxiangData.question = JSON.parse(this.daxiangData.question)
       }
+
+
+ for(let key in this.daxiangData.question){
+
+if(this.daxiangData.question[key].type == '单选') {
+
+          if( Array.isArray(this.daxiangData.question[key].choose) ) {
+            this.daxiangData.question[key].choose = this.daxiangData.question[key].choose.join(',')
+
+          }
+        }
+        if(this.daxiangData.question[key].type == '文本') {
+                   this.daxiangData.question[key].choose = this.daxiangData.question[key].choose[0]
+                }
+ }
+
       //    this.daxiangData.question = this.xuanxiang(question)
       // for (const key in  this.daxiangData.question) {