From 6b65be487eaa98b9abf54f0a6a5250005553c344 Mon Sep 17 00:00:00 2001
From: wesley88 <9519127+wesley88@user.noreply.gitee.com>
Date: Mon, 3 Mar 2025 17:53:46 +0800
Subject: [PATCH] 1

---
 admin-web-master/dist.zip                           | Bin 5728794 -> 0 bytes
 admin-web-master/src/utils/request.js               |  4 ++--
 lvdao-miniapp/pages.json                            |  7 +++++++
 lvdao-miniapp/pages/my/my.vue                       |  8 ++++++--
 lvdao-miniapp/pages/participation/participation.vue |  2 +-
 lvdao-miniapp/pages/questionnaire/questionWeb.vue   | 44 +++++++++++++++++++++++---------------------
 lvdao-miniapp/pages/questionnaire/questionnaire.vue |  8 ++------
 lvdao-miniapp/pagesA/web/web.vue                    | 22 ++++++++++++++++++++++
 8 files changed, 63 insertions(+), 32 deletions(-)
 create mode 100644 lvdao-miniapp/pagesA/web/web.vue

diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip
index d23cc7c..e50adae 100644
Binary files a/admin-web-master/dist.zip and b/admin-web-master/dist.zip differ
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index 0f94b76..3460ae7 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -16,8 +16,8 @@ let hostall = window.location.href;
 let baseURL =  ''
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
 
-  // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
-  baseURL = 'http://128.10.249.24:9003';
+  baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
+  // baseURL = 'http://128.10.249.21:9003';
 
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
   // baseURL = 'http://192.168.2.225:9003';
diff --git a/lvdao-miniapp/pages.json b/lvdao-miniapp/pages.json
index cc42e01..65e6e9a 100644
--- a/lvdao-miniapp/pages.json
+++ b/lvdao-miniapp/pages.json
@@ -397,6 +397,13 @@
 		"name": "pagesA",
 		"pages": [
 			{
+				"path": "web/web",
+				"style": {
+					"navigationBarBackgroundColor": "#FFFFFF",
+					"navigationBarTitleText": "投诉建议"
+				}
+			},
+			{
 				"path": "tishi/tishi",
 				"style": {
 					"navigationBarBackgroundColor": "#FFFFFF",
diff --git a/lvdao-miniapp/pages/my/my.vue b/lvdao-miniapp/pages/my/my.vue
index 5ae286e..ea4e695 100644
--- a/lvdao-miniapp/pages/my/my.vue
+++ b/lvdao-miniapp/pages/my/my.vue
@@ -24,7 +24,7 @@
 				</view>
 				<view class="info">
 					<view class="nickname">
-						<text v-if="Islogin" @click="gopath('/pages/login/login')">请登录/入驻</text>
+						<text style="width: 100%;" v-if="Islogin" @click="gopath('/pages/login/login')">请登录</text>
 						<text v-else>{{user.name}}</text>
 					</view>
 					<!-- 					<view class="rank">
@@ -292,6 +292,7 @@
 					 }
 					if(res.data.data.content.length>0) {
 						let c1 = res.data.data.content[0]
+						this.user = c1
 						console.error({...c1})
 						if(c1.checkState == '2') {
 							this.isshopon = true
@@ -387,8 +388,11 @@
 			complaint() {
 				console.log('1111',this.Islogin)
 				if (this.Islogin == false) {
+					// uni.navigateTo({
+					// 	url: '/pages/complaint/complaint'
+					// })
 					uni.navigateTo({
-						url: '/pages/complaint/complaint'
+						url: '/pagesA/web/web'
 					})
 				}
 
diff --git a/lvdao-miniapp/pages/participation/participation.vue b/lvdao-miniapp/pages/participation/participation.vue
index efd4da7..4d6b48e 100644
--- a/lvdao-miniapp/pages/participation/participation.vue
+++ b/lvdao-miniapp/pages/participation/participation.vue
@@ -26,7 +26,7 @@
 		<view class="goods-data">
 			<u-row gutter="16" class="goods-list">
 				<u-col span="6" v-for="(item,index) in datalist" :key="index"  @click="toDetail(item.id, '/pages/activityDetail/activityDetail')" >
-					<view class="demo-layout good-item">
+					<view class="demo-layout good-item" style="margin-bottom: 30rpx;">
 						<u-image  :src="imgurl+item.coverImage" border-radius="10" mode="heightFix" height="110px" style="margin-top:8px;margin-right:8px;" ></u-image>
 						<view class="info">
 							<view class="title">{{item.activityName}}</view>
diff --git a/lvdao-miniapp/pages/questionnaire/questionWeb.vue b/lvdao-miniapp/pages/questionnaire/questionWeb.vue
index 24a08d3..43996b1 100644
--- a/lvdao-miniapp/pages/questionnaire/questionWeb.vue
+++ b/lvdao-miniapp/pages/questionnaire/questionWeb.vue
@@ -1,31 +1,33 @@
 <template>
-	  <view>
-		  <web-view :src="url"></web-view>
-	  </view>
+	<view>
+		<web-view :src="url+id"></web-view>
+	</view>
 </template>
 
 <script>
 	export default {
-	data() {
-		return {
-			url:''
+		data() {
+			return {
+				id: '',
+				url: 'https://zhgw-uat.028wlkj.com/cdwlMall/meh5/pages_category_page1/question/question?ids='
 			}
-	},
-	onBackPress() {
-	    // 拦截返回事件
-	    uni.redirectTo({
-	      url: '/pages/questionnaire/questionnaire'
-	    });
-	    return true; 
-	  },
-	  onLoad(options) {
-			 if(options.urls){
-				 this.url = options.urls
-			 }
-	  },
-	  mounted() {
+		},
+		onBackPress() {
+			// 拦截返回事件
+			uni.redirectTo({
+				url: '/pages/questionnaire/questionnaire'
+			});
+			return true;
+		},
+		onLoad(options) {
+			if (options.id) {
+				this.id = options.id
+				console.log(this.id)
+			}
+		},
+		mounted() {
 
-	  }
+		}
 	}
 </script>
 
diff --git a/lvdao-miniapp/pages/questionnaire/questionnaire.vue b/lvdao-miniapp/pages/questionnaire/questionnaire.vue
index 46176c8..a6c5762 100644
--- a/lvdao-miniapp/pages/questionnaire/questionnaire.vue
+++ b/lvdao-miniapp/pages/questionnaire/questionnaire.vue
@@ -118,13 +118,9 @@
 				})
 			},
 			goview(item) {
-				const host = `${window.location.protocol}//${window.location.host}`
-				let wenjuanUrl = `${host}/cdwlMall/meh5/pages_category_page1/question/question?ids=${item.id}`
-				// const host =  'https://jy.scjysm.asia:18086/cdwlMall/meh5/'
-				// const host =  'http://localhost:8080/cdwlMall/meh5/'
-				// let  wenjuanUrl = `${host}pages_category_page1/question/question?ids=${item.id}`
+
 				uni.navigateTo({
-					url: `/pages/questionnaire/questionWeb?urls=${wenjuanUrl}`
+					url: `/pages/questionnaire/questionWeb?id=${item.id}`
 				})
 			}
 		}
diff --git a/lvdao-miniapp/pagesA/web/web.vue b/lvdao-miniapp/pagesA/web/web.vue
new file mode 100644
index 0000000..fd71bbd
--- /dev/null
+++ b/lvdao-miniapp/pagesA/web/web.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		<web-view :src="url"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				url:'https://zhgw-uat.028wlkj.com/cdwlOa/h5/#/publicFeedback?nickName='+ uni.getStorageSync('user').name+'&mobilePhone='+uni.getStorageSync('user').phone+'&tabbar=1'
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
--
libgit2 0.21.4