webapp / GreenwayWeb

Commit 8c0a246335ba26ccdec98dafd3c8c9dcabfc3564

Authored by 杨鑫
1 parent 00bbdbd2

'最新'

Inline Side-by-side
Showing 8 changed files with 124 additions and 18 deletions
lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.scss
  View file @8c0a246
... ... @@ -86,7 +86,7 @@
86 86 .userForm {
87 87 margin: 0 40rpx ;
88 88 .form-box {
89   - padding: 28rpx;
  89 + padding: 18rpx 30rpx;
90 90  
91 91 }
92 92 .title {
... ...
lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.vue
  View file @8c0a246
... ... @@ -32,7 +32,7 @@
32 32 <text>客服</text>
33 33 </view> -->
34 34 <view class="footer-btn">
35   - <u-button type="success" style="width:90%" @click="joinShow = true">报名参加</u-button>
  35 + <u-button type="success" style="width:90%" @click="baoShow">报名参加</u-button>
36 36 </view>
37 37 <!-- <view class="footer-service">
38 38 <u-image :showLoading="true" :src="$imgUrl('/share-icon.png')" width="30rpx" height="30rpx"></u-image>
... ... @@ -40,12 +40,12 @@
40 40 </view> -->
41 41  
42 42 </view>
43   - <u-popup class="userForm" v-model="joinShow" mode="center" :closeable="true" width="90%" >
  43 + <u-popup class="userForm" v-model="joinShow" mode="center" border-radius="20" :closeable="true" width="90%" >
44 44 <u-form class="form-box" :model="form" ref="uForm" :label-width="120" >
45   - <view style="padding: 20rpx;">
  45 + <view style="padding: 10rpx;">
46 46 <view class="title">请填写您的报名信息</view>
47   - <u-form-item label="姓名"><u-input v-model="form.userName" /></u-form-item>
48   - <u-form-item label="电话"><u-input v-model="form.userPhone" /></u-form-item>
  47 + <u-form-item label="*姓名"><u-input v-model="form.userName" /></u-form-item>
  48 + <u-form-item label="*电话"><u-input v-model="form.userPhone" /></u-form-item>
49 49 <u-button type="success" @click="submit">提交</u-button>
50 50 </view>
51 51 </u-form>
... ... @@ -112,7 +112,28 @@ if(option.scene){
112 112  
113 113 },
114 114 methods: {
  115 + baoShow(){
  116 + this.joinShow = true
  117 + this.form.userName = ''
  118 + this.form.userPhone = ''
  119 + },
115 120 submit() {
  121 + if (!this.form.userName) {
  122 + uni.showToast({
  123 + icon: 'none',
  124 + title: '请输入姓名'
  125 + });
  126 + return
  127 + }
  128 +
  129 +
  130 + if (!this.form.userPhone) {
  131 + uni.showToast({
  132 + icon: 'none',
  133 + title: '请输入联系电话'
  134 + });
  135 + return
  136 + }
116 137 this.form.createTime = this.getCurrentDateTime()
117 138 this.$http.sendRequest('/cereEventRegistration/add', 'POST',this.form,1).then(res => {
118 139  
... ...
lvdao-miniapp/pages/serve/jiDed.vue
  View file @8c0a246
... ... @@ -17,6 +17,10 @@
17 17 <view class="label">备注信息</view>
18 18 <text>{{record.memo || record.remark}}</text>
19 19 </view>
  20 + <view style="padding: 5px 0;line-height: 36px;">
  21 + <view >评价信息</view>
  22 + </view>
  23 + <view style="padding: 10px 0; border-bottom: #eee solid 1rpx;">{{record.estimate || '无'}}</view>
20 24 <view style="padding: 5px 0;line-height: 36px;">现场照片</view>
21 25 <view class="imgList">
22 26 <u-image width="48%" height="280" border-radius="10" :src="$img+item" v-for="(item,index) in this.record.onSitePhoto"></u-image>
... ...
lvdao-miniapp/pages/serve/serve.scss
  View file @8c0a246
... ... @@ -74,3 +74,25 @@
74 74 }
75 75 }
76 76 }
  77 + .content{
  78 + display: flex;
  79 + align-items: center;
  80 + text-align: right;
  81 + input{
  82 + width: 100%;
  83 + color: #222222;
  84 + font-size: 26rpx;
  85 + padding-top: 6rpx;
  86 + /* #ifdef MP */
  87 + padding-top: 5rpx;
  88 + /* #endif */
  89 + }
  90 + image {
  91 + width: 20rpx;
  92 + height: 20rpx;
  93 + margin-left: 10rpx;
  94 + /* #ifdef MP */
  95 + margin-top: 5rpx;
  96 + /* #endif */
  97 + }
  98 + }
... ...
lvdao-miniapp/pages/serve/serve.vue
  View file @8c0a246
... ... @@ -15,6 +15,9 @@
15 15 </view>
16 16 <view class="info-item">申请时间：{{item.applicationTime}}</view>
17 17 <view class="info-item">状态：<span style="color: #0FBB59;">{{item.status=='1'?'受理中':'已完成'}}</span></view>
  18 + <view style="margin-top: 10px;" v-if="item.status == '2'">
  19 + <u-button type="success" style="width:30%;height: 28px;margin: 0 10px 0 0;" @click="baoShow(0,item.id)">评价</u-button>
  20 + </view>
18 21 </view>
19 22 </view>
20 23 <view class="record-list-box" v-for="(item,index) in toushu" :key="index" @click="recordXq(item)">
... ... @@ -25,13 +28,25 @@
25 28 </view>
26 29 <view class="info-item">申请时间：{{item.applicationTime}}</view>
27 30 <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>
  31 + <view style="margin-top: 10px;" v-if="item.status == '2'">
  32 + <u-button type="success" style="width:30%;height: 28px;margin: 0 10px 0 0;" @click="baoShow(1,item.id)">评价</u-button>
30 33 </view>
31 34 </view>
32 35 </view>
33 36 </view>
34 37 <u-select v-model="typeShow" :list="activesType" @confirm="typeChange"></u-select>
  38 + <u-popup class="userForm" v-model="joinShow" mode="center" border-radius="20" :closeable="true" width="90%" >
  39 + <view style="padding: 30rpx;">
  40 + <view style="text-align: center;font-size: 16px;font-weight: 600;margin-bottom: 30rpx;">评价</view>
  41 + <view class="" style="background-color: #F0F0F0;border-radius: 20rpx;margin-bottom: 15px;">
  42 + <textarea cols="30" rows="10" placeholder="请输入" maxlength="150" style="font-size: 24rpx;background-color: #F0F0F0;border-radius: 20rpx;width: 96%;margin: 0 auto;padding: 20rpx;" v-model="form.estimate"></textarea>
  43 + <p style="text-align: right; font-size: 24rpx; color: #666;padding:0 20rpx 10rpx 0;">
  44 + 剩余 {{ remainingCharacters }} 字
  45 + </p>
  46 + </view>
  47 + <u-button type="success" @click="submit">提交</u-button>
  48 + </view>
  49 + </u-popup>
35 50 </view>
36 51 </template>
37 52  
... ... @@ -56,13 +71,31 @@
56 71 label: '报修记录'
57 72 }
58 73 ],
59   - typeShow:false
  74 + typeShow:false,
  75 + joinShow:false,
  76 + form:{
  77 + estimate:'',
  78 + id:''
  79 + },
  80 + indexMsg :0
60 81 }
61 82 },
62 83 mounted(){
63 84 this.getALL()
64 85 },
  86 + computed: {
  87 + remainingCharacters() {
  88 + const maxLength = 150;
  89 + return maxLength - this.form.estimate.length;
  90 + }
  91 + },
65 92 methods: {
  93 + baoShow(val,ids){
  94 + this.joinShow = true
  95 + this.form.estimate = ''
  96 + this.form.id = ids
  97 + this.indexMsg = val
  98 + },
66 99 getALL(){
67 100 this.pageindex.createUser =uni.getStorageSync('user').phone
68 101 this.$http.sendRequest('/cereComplaintsSuggestions/queryByPage', 'POST',this.pageindex,1).then(res => {
... ... @@ -82,17 +115,43 @@
82 115  
83 116 this.pageindex.start = e[0].labels
84 117 if(e[0].value == 0){
85   - this.$http.sendRequest('/cereReportIssuesRepairs/queryByPage', 'POST',this.pageindex,1).then(res => {
86   - this.recordList = res.data.data.content
  118 +
  119 + this.$http.sendRequest('/cereComplaintsSuggestions/queryByPage', 'POST',this.pageindex,1).then(res => {
  120 + this.toushu = res.data.data.content
  121 + this.recordList =[]
87 122 })
88 123 }else{
89   - this.$http.sendRequest('/cereComplaintsSuggestions/queryByPage', 'POST',this.pageindex,1).then(res => {
90   - this.toushu = res.data.data.content
  124 + this.$http.sendRequest('/cereReportIssuesRepairs/queryByPage', 'POST',this.pageindex,1).then(res => {
  125 + this.recordList = res.data.data.content
  126 + this.toushu = []
91 127 })
92 128 }
93 129 },
94 130 submit(){
95   -
  131 + if (!this.form.estimate) {
  132 + uni.showToast({
  133 + icon: 'none',
  134 + title: '请输入评价信息'
  135 + });
  136 + return;
  137 + }
  138 + if(this.indexMsg == 1){
  139 + this.$http.sendRequest('/cereComplaintsSuggestions/edit', 'POST',this.form,1).then(res => {
  140 + uni.showToast({
  141 + icon: 'success',
  142 + title: '评价成功'
  143 + });
  144 + })
  145 + this.joinShow = false
  146 + }else{
  147 + this.$http.sendRequest('/cereReportIssuesRepairs/edit', 'POST',this.form,1).then(res => {
  148 + uni.showToast({
  149 + icon: 'success',
  150 + title: '评价成功'
  151 + });
  152 + })
  153 + this.joinShow = false
  154 + }
96 155 }
97 156 }
98 157 }
... ...
wenjuan-pc/dist.zip deleted
View file @00bbdbd
No preview for this file type
wenjuan-pc/src/main.js
  View file @8c0a246
... ... @@ -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://172.16.61.123/cdwlMall/meserver/api'
33   -// Vue.prototype.$API = `${window.location.protocol}//${window.location.host}/cdwlMall/meserver/api`
  32 +// Vue.prototype.$API = 'http://172.16.61.123/cdwlMall/meserver/api'
  33 +Vue.prototype.$API = `${window.location.protocol}//${window.location.host}/cdwlMall/meserver/api`
34 34 // Vue.prototype.$API = process.env.VUE_APP_DOMAIN_PREFIX_2
35 35 Vue.prototype.$hostUrl = `${window.location.protocol}//${window.location.host}/cdwlMall`
36 36  
... ...
wenjuan-pc/src/utils/request.js
  View file @8c0a246
... ... @@ -21,8 +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://10.0.0.41:9003';
25   - // baseURL = 'http://172.16.61.125:9003';
  24 + // baseURL = 'http://10.0.0.41:9003';
  25 + baseURL = 'http://172.16.61.123:9003';
26 26 // baseURL = 'http://172.16.61.125:9003';
27 27 // baseURL = 'http://192.168.2.36:9003';
28 28 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
... ...