webapp / GreenwayWeb

Commit cff964f80b8545c9e7ee00a708aa7ba83d3f50d4

Authored by 杨鑫
1 parent b886ae6d

最新1

Inline Side-by-side
Showing 15 changed files with 66 additions and 43 deletions
admin-web-master/src/views/atmosphere/atmosphereBz.vue
  View file @cff964f
... ... @@ -372,10 +372,11 @@
372 372  
373 373 </div>
374 374 <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0">
375   - <el-button plain @click="minSev" size="mini" style="background-color: #3F9B6A;color: #fff;">确定
376   - </el-button>
377 375 <el-button plain @click="addMing=false" size="mini" style="background-color: #3F9B6A;color: #fff;">取消
378 376 </el-button>
  377 + <el-button plain @click="minSev" size="mini" style="background-color: #3F9B6A;color: #fff;">确定
  378 + </el-button>
  379 +
379 380  
380 381  
381 382 </div>
... ...
admin-web-master/src/views/couponmanagement/capitalpool.vue
  View file @cff964f
... ... @@ -84,7 +84,7 @@
84 84 </el-table>
85 85 <div style="display: flex;justify-content: space-between;" class="bom">
86 86 <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 项数据</div>
87   - <el-pagination :current-page="query.pageNumber" :page-sizes="[10, 20, 50, 100]" :page-size="10" background
  87 + <el-pagination :current-page="query.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="10" background
88 88 small layout="prev, pager, next" :total="total" @size-change="handleSizeChange"
89 89 @current-change="handleCurrentChange">
90 90 </el-pagination>
... ... @@ -219,7 +219,7 @@
219 219 activityName: '', // 活动名称
220 220 // 活动状态 0-报名未开始 1-报名进行中 2-活动待开始 3-活动进行中 4-活动已结束
221 221 state: '',
222   - pageNumber: 1,
  222 + pageNumber: 0,
223 223 pageSize: 10
224 224 },
225 225 total: 0,
... ... @@ -573,12 +573,12 @@
573 573 this.getAll()
574 574 },
575 575 handleCurrentChange(val) {
576   - this.query.pageNumber = val
  576 + this.query.pageNumber = val - 1
577 577 this.getAll()
578 578 },
579 579 search() {
580 580 this.total = 1
581   - this.query.pageNumber = 1
  581 + this.query.pageNumber = 0
582 582 this.getAll()
583 583 },
584 584 // 重置
... ... @@ -586,7 +586,7 @@
586 586 this.query = {
587 587 activityName: '',
588 588 state: '',
589   - pageNumber: 1,
  589 + pageNumber: 0,
590 590 pageSize: 10
591 591 }
592 592 this.getAll()
... ...
ceres-uniapp-master/config/api.js
  View file @cff964f
... ... @@ -45,9 +45,9 @@ const TERMINAL = 1
45 45  
46 46 module.exports = {
47 47 terminal: TERMINAL, // 画布设备 1 小程序，2 H5，3 App 4 电脑
48   - SettledMerchantPrefix: TIAOZHUAN + 'settled-merchant' ,
  48 + // SettledMerchantPrefix: TIAOZHUAN + 'settled-merchant' ,
49 49 // 'https://jy.scjysm.asia:18086/cdwlMall/settled-merchant', //商家入驻链接
50   - // SettledMerchantPrefix:'http://localhost:8082',
  50 + SettledMerchantPrefix:'http://localhost:8081',
51 51 shareLink: TIAOZHUAN + 'meh5', // 分享地址
52 52 // shareLink: 'http://172.16.61.123:9007/h5', // 分享地址
53 53  
... ...
ceres-uniapp-master/pages_category_page1/customer/chatBox.vue
  View file @cff964f
... ... @@ -15,10 +15,11 @@
15 15 <view style="text-align: right;margin-top: 10rpx;" v-if="item.messageType==1">
16 16 <view class="uni-comment-top" style="margin-right: 10px;">
17 17 <view>{{item.userName==''||item.userName==null?'匿名':item.userName}}</view>
18   - <view class="uni-comment-date">{{item.chatTime}}</view>
  18 +
19 19  
20 20 </view>
21 21 <view class="uni-comment-content ziji" style="margin-right: 10px;text-align: right;padding-right: 15px;">{{item.chatContent}}</view>
  22 + <view class="uni-comment-date">{{item.chatTime}}</view>
22 23 </view>
23 24 <view class="uni-comment-face" v-if="item.messageType==1">
24 25 <image :src="$baseURL+user.headImage" mode="widthFix"></image>
... ... @@ -30,9 +31,10 @@
30 31 <view class="uni-comment-body" v-if="item.messageType==2">
31 32 <view class="uni-comment-top">
32 33 <view>{{item.shopName==''||item.shopName==null?'匿名':item.shopName}}</view>
33   - <view class="uni-comment-date">{{item.chatTime}}</view>
  34 +
34 35 </view>
35 36 <view class="uni-comment-content kehu" style="text-align: left;padding-left: 15px;">{{item.chatContent}}</view>
  37 + <view class="uni-comment-date">{{item.chatTime}}</view>
36 38 </view>
37 39 </view>
38 40  
... ... @@ -45,9 +47,10 @@
45 47 <view class="uni-comment-body">
46 48 <view class="uni-comment-top">
47 49 <view>商家</view>
48   - <view class="uni-comment-date"></view>
  50 +
49 51 </view>
50 52 <view class="uni-comment-content kehu" style="text-align: left;padding-left: 15px;">您好！请问有什么问题呢？</view>
  53 + <view class="uni-comment-date"></view>
51 54 </view>
52 55 </view>
53 56 </view>
... ... @@ -237,7 +240,7 @@
237 240  
238 241 .uni-comment-body {
239 242 margin-top: 10rpx;
240   - // width: 100%;
  243 + width: 100%;
241 244 }
242 245  
243 246 .uni-comment-top {
... ... @@ -254,16 +257,26 @@
254 257 }
255 258  
256 259 .uni-comment-top{
257   - .uni-comment-date {
258   - color: #666666;
259   - font-size: 20upx;
260   - }
  260 +
261 261 }
262   -
  262 + .uni-comment-date {
  263 + color: #666666;
  264 + font-size: 24upx;
  265 + }
263 266 .uni-comment-content {
264 267 line-height: 1.6em;
265 268 font-size: 28upx;
266   - padding: 8rpx 0;
  269 + padding: 8rpx 10px;
  270 + margin:8rpx 0;
  271 + /* 移除固定高度和宽度 */
  272 + height: auto;
  273 + width: auto;
  274 + /* 使用 inline-block 或 flex 让盒子根据内容自动调整大小 */
  275 + display: inline-block;
  276 + max-width: 70%; /* 大致限制宽度为父元素的 70% */
  277 + word-wrap: break-word; /* 允许长单词换行 */
  278 + overflow-wrap: break-word; /* 同 word-wrap，更标准的写法 */
  279 + display: inline-block; /* 让盒子根据内容自适应宽度 */
267 280 }
268 281  
269 282 .uni-comment-replay-btn {
... ...
ceres-uniapp-master/pages_category_page1/question/succe.vue
  View file @cff964f
1 1 <template>
2 2 <view class="questionnaire">
3   - <view style="position: absolute;top:35%;width:80%;left:10%" v-if="yuan">
  3 + <view style="position: absolute;top:30%;width:80%;left:10%" v-if="yuan">
4 4 <image src="../../static/images/tijiao.png" style="width:100%;" mode="aspectFit"></image>
5 5 <button class="submit-btn" @click="guanbi">关闭</button>
6 6 </view>
7   - <view style="position: absolute;top:35%;width:80%;left:10%" v-if="chong">
  7 + <view style="position: absolute;top:30%;width:80%;left:10%" v-if="chong">
8 8 <image src="../../static/images/tijiaoTwo.png" style="width:100%;" mode="aspectFit"></image>
9 9 </view>
10   - <view style="position: absolute;top:35%;width:80%;left:10%" v-if="yuan == false && chong == false">
  10 + <view style="position: absolute;top:30%;width:80%;left:10%" v-if="yuan == false && chong == false">
11 11 <image src="../../static/images/tijiaoThree.png" style="width:100%;" mode="aspectFit"></image>
12 12 <view style="text-align: center;font-size: 20px;color: grey;">{{msg}}</view>
13 13 </view>
... ...
settled-merchant-master/src/api/index.js
  View file @cff964f
... ... @@ -3,13 +3,14 @@ import home from &#39;./home&#39;
3 3 const host = `${window.location.protocol}//${window.location.host}`
4 4 const TIAOZHUAN = `${host}/cdwlMall/meserver/`
5 5 // 获取当前环境变量 true => 生产环境 false => 开发环境
6   -const BASEURL = (process.env.NODE_ENV === 'production') ? TIAOZHUAN + 'api' : 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
7   -const upUrl = (process.env.NODE_ENV === 'production') ? TIAOZHUAN + 'admin-server' : 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
  6 +const BASEURL = (process.env.NODE_ENV === 'production') ? TIAOZHUAN + 'api' : 'http://128.10.249.28:9007'
  7 +const upUrl = (process.env.NODE_ENV === 'production') ? TIAOZHUAN + 'admin-server' : 'http://128.10.249.28:9003'
8 8 export const api = {
9 9 // 登录模块
10 10 ...home(BASEURL),
11 11 // 图片上传
12 12 upload: `${upUrl}/miniio/uploadQuestion`,
  13 + // upload: `http://172.16.61.237:9000/miniio/uploadQuestion`,
13 14 // 商家入驻
14 15 enterpriseCheck: `${BASEURL}/check/enterpriseCheck`,
15 16 individualCheck: `${BASEURL}/check/individualCheck`,
... ...
settled-merchant-master/src/main.js
  View file @cff964f
... ... @@ -17,7 +17,7 @@ Vue.prototype.$message = ElementUI.Message
17 17 let host = window.location.host
18 18 if (host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528' || host === '192.168.31.45:9528' || host === 'localhost:9529') {
19 19 Vue.prototype.$baseURL = 'https://jy.scjysm.asia:18086/cdwlMall'
20   - Vue.prototype.$baseURL = `${window.location.protocol}//${window.location.host}/cdwlMall`
  20 + // Vue.prototype.$baseURL = `${window.location.protocol}//${window.location.host}/cdwlMall`
21 21 } else {
22 22 Vue.prototype.$baseURL = `${window.location.protocol}//${window.location.host}/cdwlMall`
23 23 }
... ...
settled-merchant-master/src/views/SettleIn/enterprisesApply.vue
  View file @cff964f
... ... @@ -232,8 +232,8 @@ export default {
232 232 enterpriseCardStartTime: '', // 证件有效开始时间
233 233 enterpriseCardEndTime: '', // 证件有效结束时间
234 234 enterpriseCardPositive: '', // 身份证正面照
235   - enterpriseCardSide: '' ,// 身份证反面照
236   - merchantType: '线上商家'
  235 + enterpriseCardSide: '', // 身份证反面照
  236 + merchantType: '线上商家'
237 237 },
238 238 idCardList: [],
239 239 dictName: '证件类型',
... ...
settled-merchant-master/src/views/SettleIn/individualBusiness.vue
  View file @cff964f
... ... @@ -232,8 +232,8 @@ export default {
232 232 subjectCardStartTime: '', // 证件有效开始时间
233 233 subjectCardEndTime: '', // 证件有效结束时间
234 234 subjectCardPositive: '', // 身份证正面照
235   - subjectCardSide: '' ,// 身份证反面照
236   - merchantType: '线上商家'
  235 + subjectCardSide: '', // 身份证反面照
  236 + merchantType: '线上商家'
237 237 },
238 238 idCardList: [],
239 239 dictName: '证件类型',
... ...
settled-merchant-master/src/views/SettleIn/organization.vue
  View file @cff964f
... ... @@ -230,8 +230,8 @@ export default {
230 230 otherCardStartTime: '', // 证件有效开始时间
231 231 otherCardEndTime: '', // 证件有效结束时间
232 232 otherCardPositive: '', // 身份证正面照
233   - otherCardSide: '' ,// 身份证反面照
234   - merchantType: '线上商家'
  233 + otherCardSide: '', // 身份证反面照
  234 + merchantType: '线上商家'
235 235 },
236 236 idCardList: [],
237 237 dictName: '证件类型',
... ...
settled-merchant-master/src/views/SettleIn/personal.vue
  View file @cff964f
... ... @@ -186,8 +186,8 @@ export default {
186 186 personalCardEndTime: '', // 证件有效结束时间
187 187 personalCardPositive: '', // 身份证正面照
188 188 personalCardSide: '', // 身份证反面照
189   - personalCardHand: '' ,// 手持证件照
190   - merchantType: '线上商家'
  189 + personalCardHand: '', // 手持证件照
  190 + merchantType: '线上商家'
191 191 },
192 192 idCardList: [],
193 193 dictName: '证件类型',
... ...
settled-merchant-master/src/views/moblie/mEnterprise.vue
  View file @cff964f
... ... @@ -284,8 +284,8 @@ export default {
284 284 enterpriseCardStartTime: '', // 证件有效开始时间
285 285 enterpriseCardEndTime: '', // 证件有效结束时间
286 286 enterpriseCardPositive: '', // 身份证正面照
287   - enterpriseCardSide: '' ,// 身份证反面照
288   - merchantType: '线上商家'
  287 + enterpriseCardSide: '', // 身份证反面照
  288 + merchantType: '线上商家'
289 289 },
290 290 idCardList: [],
291 291 dictName: '证件类型',
... ... @@ -344,15 +344,19 @@ export default {
344 344 this.show = false
345 345 },
346 346 selectStartDateBtn () {
  347 + this.startDate = new Date()
347 348 this.startDateShow = true
348 349 },
349 350 selectEndDateBtn () {
  351 + this.endDate = new Date()
350 352 this.endDateShow = true
351 353 },
352 354 selectIdStartDateBtn () {
  355 + this.idCardStartDate = new Date()
353 356 this.idCardStartShow = true
354 357 },
355 358 selectIdEndDateBtn () {
  359 + this.idCardEndDate = new Date()
356 360 this.idCardEndShow = true
357 361 },
358 362 dateTime (value) {
... ...
settled-merchant-master/src/views/moblie/mOtherOrg.vue
  View file @cff964f
... ... @@ -283,8 +283,8 @@ export default {
283 283 otherCardStartTime: '', // 证件有效开始时间
284 284 otherCardEndTime: '', // 证件有效结束时间
285 285 otherCardPositive: '', // 身份证正面照
286   - otherCardSide: '' ,// 身份证反面照
287   - merchantType: '线上商家'
  286 + otherCardSide: '', // 身份证反面照
  287 + merchantType: '线上商家'
288 288 },
289 289 idCardList: [],
290 290 dictName: '证件类型',
... ...
settled-merchant-master/src/views/moblie/mPersonal.vue
  View file @cff964f
... ... @@ -206,8 +206,8 @@ export default {
206 206 personalCardEndTime: '', // 证件有效结束时间
207 207 personalCardPositive: '', // 身份证正面照
208 208 personalCardSide: '', // 身份证反面照
209   - personalCardHand: '' ,// 手持证件照
210   - merchantType: '线上商家'
  209 + personalCardHand: '', // 手持证件照
  210 + merchantType: '线上商家'
211 211 },
212 212 idCardList: [],
213 213 dictName: '证件类型',
... ...
settled-merchant-master/src/views/moblie/mUinitBusiness.vue
  View file @cff964f
... ... @@ -247,8 +247,8 @@ export default {
247 247 areaRegionList: AreaList,
248 248 show: false,
249 249 regionShow: false,
250   - minDate: new Date(1960, 1, 1),
251   - maxDate: new Date(2077, 12, 31),
  250 + minDate: new Date(1980, 1, 1),
  251 + maxDate: new Date(2100, 12, 31),
252 252 startDate: '',
253 253 endDate: '',
254 254 idCardStartDate: '',
... ... @@ -287,8 +287,8 @@ export default {
287 287 subjectCardStartTime: '', // 证件有效开始时间
288 288 subjectCardEndTime: '', // 证件有效结束时间
289 289 subjectCardPositive: '', // 身份证正面照
290   - subjectCardSide: '' ,// 身份证反面照
291   - merchantType: '线上商家'
  290 + subjectCardSide: '', // 身份证反面照
  291 + merchantType: '线上商家'
292 292 },
293 293 idCardList: [],
294 294 dictName: '证件类型',
... ... @@ -417,15 +417,19 @@ export default {
417 417 this.show = false
418 418 },
419 419 selectStartDateBtn () {
  420 + this.startDate = new Date()
420 421 this.startDateShow = true
421 422 },
422 423 selectEndDateBtn () {
  424 + this.endDate = new Date()
423 425 this.endDateShow = true
424 426 },
425 427 selectIdStartDateBtn () {
  428 + this.idCardStartDate = new Date()
426 429 this.idCardStartShow = true
427 430 },
428 431 selectIdEndDateBtn () {
  432 + this.idCardEndDate = new Date()
429 433 this.idCardEndShow = true
430 434 },
431 435 dateTime (value) {
... ...