webapp / GreenwayWeb

Commit 6b65be487eaa98b9abf54f0a6a5250005553c344

Authored by wesley88
1 parent 8ef2ad5f

1

Inline Side-by-side
Showing 8 changed files with 63 additions and 32 deletions
admin-web-master/dist.zip
View file @6b65be4
No preview for this file type
admin-web-master/src/utils/request.js
  View file @6b65be4
@@ -16,8 +16,8 @@ let hostall = window.location.href; @@ -16,8 +16,8 @@ let hostall = window.location.href;
16 let baseURL = '' 16 let baseURL = ''
17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { 17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
18 18
19 - // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';  
20 - baseURL = 'http://128.10.249.24:9003'; 19 + baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
  20 + // baseURL = 'http://128.10.249.21:9003';
21 21
22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; 22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
23 // baseURL = 'http://192.168.2.225:9003'; 23 // baseURL = 'http://192.168.2.225:9003';
lvdao-miniapp/pages.json
  View file @6b65be4
@@ -397,6 +397,13 @@ @@ -397,6 +397,13 @@
397 "name": "pagesA", 397 "name": "pagesA",
398 "pages": [ 398 "pages": [
399 { 399 {
  400 + "path": "web/web",
  401 + "style": {
  402 + "navigationBarBackgroundColor": "#FFFFFF",
  403 + "navigationBarTitleText": "投诉建议"
  404 + }
  405 + },
  406 + {
400 "path": "tishi/tishi", 407 "path": "tishi/tishi",
401 "style": { 408 "style": {
402 "navigationBarBackgroundColor": "#FFFFFF", 409 "navigationBarBackgroundColor": "#FFFFFF",
lvdao-miniapp/pages/my/my.vue
  View file @6b65be4
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 </view> 24 </view>
25 <view class="info"> 25 <view class="info">
26 <view class="nickname"> 26 <view class="nickname">
27 - <text v-if="Islogin" @click="gopath('/pages/login/login')">请登录/入驻</text> 27 + <text style="width: 100%;" v-if="Islogin" @click="gopath('/pages/login/login')">请登录</text>
28 <text v-else>{{user.name}}</text> 28 <text v-else>{{user.name}}</text>
29 </view> 29 </view>
30 <!-- <view class="rank"> 30 <!-- <view class="rank">
@@ -292,6 +292,7 @@ @@ -292,6 +292,7 @@
292 } 292 }
293 if(res.data.data.content.length>0) { 293 if(res.data.data.content.length>0) {
294 let c1 = res.data.data.content[0] 294 let c1 = res.data.data.content[0]
  295 + this.user = c1
295 console.error({...c1}) 296 console.error({...c1})
296 if(c1.checkState == '2') { 297 if(c1.checkState == '2') {
297 this.isshopon = true 298 this.isshopon = true
@@ -387,8 +388,11 @@ @@ -387,8 +388,11 @@
387 complaint() { 388 complaint() {
388 console.log('1111',this.Islogin) 389 console.log('1111',this.Islogin)
389 if (this.Islogin == false) { 390 if (this.Islogin == false) {
  391 + // uni.navigateTo({
  392 + // url: '/pages/complaint/complaint'
  393 + // })
390 uni.navigateTo({ 394 uni.navigateTo({
391 - url: '/pages/complaint/complaint' 395 + url: '/pagesA/web/web'
392 }) 396 })
393 } 397 }
394 398
lvdao-miniapp/pages/participation/participation.vue
  View file @6b65be4
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 <view class="goods-data"> 26 <view class="goods-data">
27 <u-row gutter="16" class="goods-list"> 27 <u-row gutter="16" class="goods-list">
28 <u-col span="6" v-for="(item,index) in datalist" :key="index" @click="toDetail(item.id, '/pages/activityDetail/activityDetail')" > 28 <u-col span="6" v-for="(item,index) in datalist" :key="index" @click="toDetail(item.id, '/pages/activityDetail/activityDetail')" >
29 - <view class="demo-layout good-item"> 29 + <view class="demo-layout good-item" style="margin-bottom: 30rpx;">
30 <u-image :src="imgurl+item.coverImage" border-radius="10" mode="heightFix" height="110px" style="margin-top:8px;margin-right:8px;" ></u-image> 30 <u-image :src="imgurl+item.coverImage" border-radius="10" mode="heightFix" height="110px" style="margin-top:8px;margin-right:8px;" ></u-image>
31 <view class="info"> 31 <view class="info">
32 <view class="title">{{item.activityName}}</view> 32 <view class="title">{{item.activityName}}</view>
lvdao-miniapp/pages/questionnaire/questionWeb.vue
  View file @6b65be4
1 <template> 1 <template>
2 - <view>  
3 - <web-view :src="url"></web-view>  
4 - </view> 2 + <view>
  3 + <web-view :src="url+id"></web-view>
  4 + </view>
5 </template> 5 </template>
6 6
7 <script> 7 <script>
8 export default { 8 export default {
9 - data() {  
10 - return {  
11 - url:'' 9 + data() {
  10 + return {
  11 + id: '',
  12 + url: 'https://zhgw-uat.028wlkj.com/cdwlMall/meh5/pages_category_page1/question/question?ids='
12 } 13 }
13 - },  
14 - onBackPress() {  
15 - // 拦截返回事件  
16 - uni.redirectTo({  
17 - url: '/pages/questionnaire/questionnaire'  
18 - });  
19 - return true;  
20 - },  
21 - onLoad(options) {  
22 - if(options.urls){  
23 - this.url = options.urls  
24 - }  
25 - },  
26 - mounted() { 14 + },
  15 + onBackPress() {
  16 + // 拦截返回事件
  17 + uni.redirectTo({
  18 + url: '/pages/questionnaire/questionnaire'
  19 + });
  20 + return true;
  21 + },
  22 + onLoad(options) {
  23 + if (options.id) {
  24 + this.id = options.id
  25 + console.log(this.id)
  26 + }
  27 + },
  28 + mounted() {
27 29
28 - } 30 + }
29 } 31 }
30 </script> 32 </script>
31 33
lvdao-miniapp/pages/questionnaire/questionnaire.vue
  View file @6b65be4
@@ -118,13 +118,9 @@ @@ -118,13 +118,9 @@
118 }) 118 })
119 }, 119 },
120 goview(item) { 120 goview(item) {
121 - const host = `${window.location.protocol}//${window.location.host}`  
122 - let wenjuanUrl = `${host}/cdwlMall/meh5/pages_category_page1/question/question?ids=${item.id}`  
123 - // const host = 'https://jy.scjysm.asia:18086/cdwlMall/meh5/'  
124 - // const host = 'http://localhost:8080/cdwlMall/meh5/'  
125 - // let wenjuanUrl = `${host}pages_category_page1/question/question?ids=${item.id}` 121 +
126 uni.navigateTo({ 122 uni.navigateTo({
127 - url: `/pages/questionnaire/questionWeb?urls=${wenjuanUrl}` 123 + url: `/pages/questionnaire/questionWeb?id=${item.id}`
128 }) 124 })
129 } 125 }
130 } 126 }
lvdao-miniapp/pagesA/web/web.vue 0 → 100644
  View file @6b65be4
  1 +<template>
  2 + <view>
  3 + <web-view :src="url"></web-view>
  4 + </view>
  5 +</template>
  6 +
  7 +<script>
  8 + export default {
  9 + data() {
  10 + return {
  11 + url:'https://zhgw-uat.028wlkj.com/cdwlOa/h5/#/publicFeedback?nickName='+ uni.getStorageSync('user').name+'&mobilePhone='+uni.getStorageSync('user').phone+'&tabbar=1'
  12 + }
  13 + },
  14 + methods: {
  15 +
  16 + }
  17 + }
  18 +</script>
  19 +
  20 +<style>
  21 +
  22 +</style>