webapp / GreenwayWeb

Commit 4531881301c9c59e464d821e29cd52f610fffee1

Authored by 杨鑫
1 parent 1a01e014

'最新版本'

Inline Side-by-side
Showing 12 changed files with 135 additions and 53 deletions
lvdao-miniapp/pages/accepting/accepting.vue
  View file @4531881
... ... @@ -4,7 +4,7 @@
4 4 <view class="record-list">
5 5 <view class="good-item">
6 6 <view class="img">
7   - <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>
  7 + <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>
8 8 </view>
9 9 <view class="info">
10 10 <view class="title">{{
... ...
lvdao-miniapp/pages/complaint/complaint.vue
  View file @4531881
... ... @@ -143,13 +143,15 @@
143 143 }
144 144 this.ruleForm.applicationTime = this.currentTime()
145 145 this.ruleForm.createUser = uni.getStorageSync('user').phone
146   - this.ruleForm.onSitePhoto.map(item=>{
147   - item.replace(this.$img,'')
  146 + this.ruleForm.onSitePhoto = this.ruleForm.onSitePhoto.map(item=>{
  147 + return item.replace(this.$img,'');
148 148 })
  149 +
149 150 let info = {
150 151 ...this.ruleForm,
151 152 onSitePhoto:this.ruleForm.onSitePhoto.join(','),
152 153 }
  154 +
153 155 this.$http.sendRequest('/cereComplaintsSuggestions/add', 'POST',info,1).then(res => {
154 156 uni.navigateTo({
155 157 url: '/pages/serve/serve'
... ...
lvdao-miniapp/pages/record/record.vue
  View file @4531881
... ... @@ -28,20 +28,21 @@
28 28 return {
29 29 recordList:'',
30 30 pageindex: {
  31 + auditStatus:1,
31 32 pageNumber: 0,
32 33 pageSize: 10
33 34 },
34 35 activesType: [
35 36 {
36   - value: 0,
37   - label: '商铺申请记录'
38   - },{
39 37 value: 1,
40   - label: '场地申请记录'
  38 + label: '待审核'
  39 + },{
  40 + value:2,
  41 + label: '待签约'
41 42 },
42 43 {
43   - value: 2,
44   - label: '广告位申请记录'
  44 + value: 3,
  45 + label: '已驳回'
45 46 }
46 47 ],
47 48 typeShow:false,
... ... @@ -71,19 +72,9 @@
71 72 })
72 73 },
73 74 typeChange(e) {
74   -
75 75 this.pageindex.start = e[0].labels
76   - if(e[0].value == 2){
77   - this.$http.sendRequest('/cereAdvertiserInfo/queryByPage', 'POST', this.pageindex, 1).then(item => {
78   - this.recordList = item.data.data.content
79   - })
80   - }else{
81   - this.$http.sendRequest('/cereBusinessInfo/queryByPage', 'POST', this.pageindex,1).then(res => {
82   - this.recordList = res.data.data.content
83   - })
84   - }
85   -
86   - this.getALL()
  76 + this.pageindex.auditStatus = e[0].value
  77 + this.getALL()
87 78 },
88 79 }
89 80 }
... ...
lvdao-miniapp/pages/repair/repair.vue
  View file @4531881
... ... @@ -5,7 +5,7 @@
5 5 <view class="feedback-data">
6 6 <view>
7 7 <view class="title">
8   - <text style="font-weight: bold;">现场照片</text>
  8 + <text style="font-weight: bold;">*现场照片</text>
9 9  
10 10 </view>
11 11 </view>
... ... @@ -23,8 +23,8 @@
23 23 <view class="add-list">
24 24 <view class="list">
25 25 <view class="title">
26   - <text style="font-weight: bold;">设备名称</text>
27   - <!-- <text class="star">*</text> -->
  26 + <text style="font-weight: bold;">*设备名称</text>
  27 +
28 28 </view>
29 29 <view class="content">
30 30 <input type="text" placeholder="请输入" v-model="ruleForm.deviceName">
... ... @@ -32,8 +32,8 @@
32 32 </view>
33 33 <view class="list">
34 34 <view class="title">
35   - <text style="font-weight: bold;">设备类型</text>
36   - <!-- <text class="star">*</text> -->
  35 + <text style="font-weight: bold;">*设备类型</text>
  36 +
37 37 </view>
38 38 <view class="content" @click="choose(1)" style="width: 25%;">
39 39 <u-input v-model="ruleForm.deviceType" type="select" disabledColor="#ffffff"
... ... @@ -43,8 +43,8 @@
43 43 </view>
44 44 <view class="list">
45 45 <view class="title">
46   - <text style="font-weight: bold;">保修问题</text>
47   - <!-- <text class="star">*</text> -->
  46 + <text style="font-weight: bold;">*保修问题</text>
  47 +
48 48 </view>
49 49 <view class="content" @click="chooseLocation(1)" style="width: 25%;">
50 50 <u-input v-model="ruleForm.warrantyIssue" type="select" disabledColor="#ffffff"
... ... @@ -65,8 +65,8 @@
65 65 <view class="feedback-data">
66 66 <view>
67 67 <view class="title">
68   - <text style="font-weight: bold;">备注信息</text>
69   - <!-- <text class="star">*</text> -->
  68 + <text style="font-weight: bold;">*备注信息</text>
  69 +
70 70 </view>
71 71 </view>
72 72 <view class="voucher-img">
... ... @@ -94,7 +94,7 @@
94 94 return {
95 95 fileList:[],
96 96 ruleForm:{
97   - onSitePhoto:'',
  97 + onSitePhoto:[],
98 98 deviceName:'',
99 99 deviceType:'',
100 100 warrantyIssue:'',
... ... @@ -140,13 +140,58 @@
140 140 pops1(val) {
141 141 this.ruleForm.deviceType = val[0].label
142 142 },
  143 + check(){
  144 + if (this.ruleForm.onSitePhoto.length== 0) {
  145 + uni.showToast({
  146 + icon: 'none',
  147 + title: '请上传现场图片'
  148 + });
  149 + return false;
  150 + }
  151 + if (!this.ruleForm.deviceName) {
  152 + uni.showToast({
  153 + icon: 'none',
  154 + title: '请输入设备名称'
  155 + });
  156 + return false;
  157 + }
  158 + if (!this.ruleForm.deviceType) {
  159 + uni.showToast({
  160 + icon: 'none',
  161 + title: '请选择设备类型'
  162 + });
  163 + return false;
  164 + }
  165 + if (!this.ruleForm.warrantyIssue) {
  166 + uni.showToast({
  167 + icon: 'none',
  168 + title: '请选择保修问题'
  169 + });
  170 + return false;
  171 + }
  172 + if (!this.ruleForm.memo) {
  173 + uni.showToast({
  174 + icon: 'none',
  175 + title: '请输入备注信息'
  176 + });
  177 + return false;
  178 + }
  179 +
  180 + return true;
  181 + },
143 182 submit() {
144   -
  183 + let show = this.check()
  184 + if(show == false){
  185 + return
  186 + }
145 187 this.ruleForm.applicationTime = this.currentTime()
146 188 this.ruleForm.createUser = uni.getStorageSync('user').phone
  189 + this.ruleForm.onSitePhoto = this.ruleForm.onSitePhoto.map(item=>{
  190 + return item.replace(this.$img,'');
  191 + })
147 192 let info = {
148 193 ...this.ruleForm,
149   - onSitePhoto:this.ruleForm.onSitePhoto.replace(this.$img,''),
  194 + onSitePhoto:this.ruleForm.onSitePhoto.join(','),
150 195 }
151 196 this.$http.sendRequest('/cereReportIssuesRepairs/add', 'POST',info,1).then(res => {
152 197 uni.navigateTo({
... ... @@ -189,7 +234,7 @@
189 234 filePath: 'xcx', // 其他表单数据
190 235 },
191 236 success: (uploadFileRes) => {
192   - this.ruleForm.onSitePhoto= this.$img + JSON.parse(uploadFileRes.data).data
  237 + this.ruleForm.onSitePhoto.push(this.$img + JSON.parse(uploadFileRes.data).data)
193 238 uni.showToast({
194 239 title: '上传成功',
195 240 icon: 'success',
... ...
lvdao-miniapp/pages/serve/jiDed.vue
  View file @4531881
... ... @@ -17,7 +17,10 @@
17 17 <view class="label">备注信息</view>
18 18 <text>{{record.memo || record.remark}}</text>
19 19 </view>
20   -
  20 + <view style="padding: 5px 0;line-height: 36px;">现场照片</view>
  21 + <view class="imgList">
  22 + <u-image width="48%" height="280" border-radius="10" :src="$img+item" v-for="(item,index) in this.record.onSitePhoto"></u-image>
  23 + </view>
21 24 </view>
22 25  
23 26  
... ... @@ -35,6 +38,9 @@
35 38 const item = JSON.parse(decodeURIComponent(options.item));
36 39 console.log('Received item:', item);
37 40 this.record = item
  41 + if(typeof this.record.onSitePhoto == 'string'){
  42 + this.record.onSitePhoto = this.record.onSitePhoto.split(',')
  43 + }
38 44 },
39 45 methods: {
40 46  
... ... @@ -103,7 +109,7 @@
103 109 }
104 110 }
105 111 .msglist{
106   - padding: 0 30rpx;
  112 + padding: 0 30rpx 20rpx 30rpx;
107 113 background-color: #Fff;
108 114 border-radius: 14rpx;
109 115 margin-bottom: 20rpx;
... ... @@ -193,4 +199,9 @@
193 199 }
194 200 }
195 201 }
  202 + .imgList{
  203 + width: 100%;
  204 + display: flex;
  205 + justify-content: space-between;
  206 + }
196 207 </style>
... ...
lvdao-miniapp/pages/serve/serve.vue
  View file @4531881
... ... @@ -25,6 +25,9 @@
25 25 </view>
26 26 <view class="info-item">申请时间：{{item.applicationTime}}</view>
27 27 <view class="info-item">状态：<span style="color: #0FBB59;">{{item.status=='1'?'受理中':'已完成'}}</span></view>
  28 + <view style="margin-top: 10px;">
  29 + <u-button type="success" style="width:30%;height: 28px;margin: 0 10px 0 0;" @click="submit">评价</u-button>
  30 + </view>
28 31 </view>
29 32 </view>
30 33 </view>
... ... @@ -88,6 +91,9 @@
88 91 })
89 92 }
90 93 },
  94 + submit(){
  95 +
  96 + }
91 97 }
92 98 }
93 99 </script>
... ...
wenjuan-h5/config/api.js
  View file @4531881
1 1  
2 2 // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/admin-server'
3 3 // const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/api'
4   -let DOMAIN_PREFIXPING = 'http://172.16.61.125:9003'
5   -let DOMAIN_PREFIX = 'http://172.16.61.125:9007'
  4 +// let DOMAIN_PREFIXPING = 'http://172.16.61.125:9003'
  5 +// let DOMAIN_PREFIX = 'http://172.16.61.125:9007'
6 6  
7 7  
8 8 // 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;
14 14 // const DOMAIN_PREFIXPING = `${host}/cdwlMall/admin-server`
15 15 // const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api`
16 16  
17   -// const DOMAIN_PREFIXPING = `http://192.168.2.152:9003`
18   -// const DOMAIN_PREFIX = 'http://192.168.2.152:9007'
  17 +let DOMAIN_PREFIXPING = `http://10.0.0.41:9003`
  18 +let DOMAIN_PREFIX = 'http://10.0.0.41:9007'
19 19  
20 20 let host = window.location.host;
21 21 let hostall = window.location.href;
22 22 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
23   - DOMAIN_PREFIXPING = 'http://172.16.61.124:9003'
24   - DOMAIN_PREFIX = 'http://172.16.61.124:9007'
  23 + // DOMAIN_PREFIXPING = `http://10.0.0.41:9003`
  24 + // DOMAIN_PREFIX = 'http://10.0.0.41:9007'
25 25 } else {
26 26 let c1 = hostall.split('cdwlMall')[0];
27 27 DOMAIN_PREFIXPING = `${c1}/cdwlMall/admin-server`
... ...
wenjuan-h5/pages_category_page1/question/question.vue
  View file @4531881
... ... @@ -600,6 +600,7 @@
600 600 }
601 601 }
602 602 const result = Object.keys(obj.question).reduce((acc, key1) => {
  603 + console.log(obj.question[key])
603 604 const question = obj.question[key];
604 605 let chooseAnswers = []
605 606 if (!Array.isArray(question.choose)) {
... ... @@ -681,8 +682,7 @@
681 682 question: obj.question
682 683 }
683 684  
684   - console.log(tijiaoObj)
685   -
  685 +
686 686 NET.request(API.wenjuanUp, tijiaoObj, 'post').then(res => {
687 687 // this.show =true
688 688  
... ... @@ -747,9 +747,11 @@
747 747 if (res.answer == chooseItem.answer) {
748 748 console.error('；；',chooseItem.answer)
749 749 this.wenjuan.question[key].choose = chooseItem.answer
  750 + console.log('；；',this.wenjuan.question[key].choose)
750 751 }
751 752 })
752 753 }
  754 +
753 755 // console.error({
754 756 // ...this.myChoose
755 757 // })
... ... @@ -761,6 +763,7 @@
761 763 // ...chooseItem
762 764 // }
763 765 chooseItem.disabled = true
  766 + console.error(options, chooseItem, idx)
764 767 },
765 768 chooseAnswer(val,idx,item,index) {
766 769 console.log(val,idx,item,index)
... ...
wenjuan-pc/src/components/dajuanTongji/index.vue
  View file @4531881
... ... @@ -160,9 +160,9 @@ export default {
160 160 }
161 161 },
162 162 mounted () {
163   - this.loadQuestionByIndex(this.index)
164   - this.tubiao()
165   - console.log(JSON.parse(this.obj))
  163 + // this.loadQuestionByIndex(this.index)
  164 + // this.tubiao()
  165 +
166 166 // this.processData()
167 167 },
168 168 onload () {
... ... @@ -183,7 +183,7 @@ export default {
183 183 methods: {
184 184 init (data) {
185 185 this.tableData = data;
186   - // console.log('initdata',data);
  186 +
187 187 this.loadQuestionByIndex(this.index)
188 188 this.tubiao()
189 189 },
... ... @@ -195,8 +195,13 @@ export default {
195 195 } = this.tableData;
196 196  
197 197 var list = []; // 用于存储结果
  198 + var table =null
  199 + if(typeof cereQuestionnaireTable.question == 'string'){
  200 + table = JSON.parse(cereQuestionnaireTable.question); // 解析问卷中的问题数据
  201 + }else{
  202 + table = cereQuestionnaireTable.question
  203 + }
198 204  
199   - var table = JSON.parse(cereQuestionnaireTable.question); // 解析问卷中的问题数据
200 205  
201 206 // 遍历 groupKeys 中的每个条目
202 207 // for (let i = 0; i < groupKeys.length; i++) {
... ... @@ -322,6 +327,7 @@ export default {
322 327  
323 328 this.tiList = [];
324 329 this.tiList = optionlist
  330 + this.tiList = optionlist.filter(item => typeof item.title === 'string' && item.title.trim() !== '');
325 331 },
326 332 // 初始化选项统计，确保每个选项都有统计数据
327 333 initOptionStats (optionSettings) {
... ... @@ -342,6 +348,7 @@ export default {
342 348 },
343 349  
344 350 tubiao () {
  351 +
345 352 const res = this.tiList.map(function (item) {
346 353 return {
347 354 name: item.title,
... ...
wenjuan-pc/src/main.js
  View file @4531881
... ... @@ -29,8 +29,8 @@ Vue.prototype.$echarts = echarts
29 29 // Vue.prototype.$API = '/cdwlMall/meserver/api'
30 30 // Vue.prototype.$API = 'https://h5.028wlkj.com/cdwlMall/meserver/api'
31 31 // Vue.prototype.$hostUrl = 'https://h5.028wlkj.com/cdwlMall/'
32   -// Vue.prototype.$API = 'http://192.168.2.225:9007'
33   -Vue.prototype.$API = process.env.VUE_APP_DOMAIN_PREFIX_2
  32 +Vue.prototype.$API = 'http://172.16.61.123/cdwlMall/meserver/api'
  33 +// Vue.prototype.$API = process.env.VUE_APP_DOMAIN_PREFIX_2
34 34 Vue.prototype.$hostUrl = `${window.location.protocol}//${window.location.host}/cdwlMall`
35 35  
36 36  
... ...
wenjuan-pc/src/utils/request.js
  View file @4531881
... ... @@ -21,7 +21,8 @@ let hostall = window.location.href;
21 21 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
22 22  
23 23 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
24   - baseURL = 'http://172.16.61.125:9003';
  24 + baseURL = 'http://10.0.0.41:9003';
  25 + // baseURL = 'http://172.16.61.125:9003';
25 26 // baseURL = 'http://172.16.61.125:9003';
26 27 // baseURL = 'http://192.168.2.36:9003';
27 28 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
... ...
wenjuan-pc/src/views/investigation/index.vue
  View file @4531881
... ... @@ -244,7 +244,7 @@
244 244 </el-checkbox-group>
245 245  
246 246 <div v-if="item.type == '文本'" style="display: flex;flex-direction: column;">
247   - {{ item.choose }}
  247 + {{ item.choose}}
248 248  
249 249 </div>
250 250 </div>
... ... @@ -2120,6 +2120,22 @@ export default {
2120 2120 if (typeof this.daxiangData.question === 'string') {
2121 2121 this.daxiangData.question = JSON.parse(this.daxiangData.question)
2122 2122 }
  2123 +
  2124 +
  2125 + for(let key in this.daxiangData.question){
  2126 +
  2127 +if(this.daxiangData.question[key].type == '单选') {
  2128 +
  2129 + if( Array.isArray(this.daxiangData.question[key].choose) ) {
  2130 + this.daxiangData.question[key].choose = this.daxiangData.question[key].choose.join(',')
  2131 +
  2132 + }
  2133 + }
  2134 + if(this.daxiangData.question[key].type == '文本') {
  2135 + this.daxiangData.question[key].choose = this.daxiangData.question[key].choose[0]
  2136 + }
  2137 + }
  2138 +
2123 2139 // this.daxiangData.question = this.xuanxiang(question)
2124 2140  
2125 2141 // for (const key in this.daxiangData.question) {
... ...