From 77959fdbcda411f460cda6e1c895e2eb01039182 Mon Sep 17 00:00:00 2001 From: yangxin <2509699647@qq.com> Date: Thu, 27 Feb 2025 15:15:27 +0800 Subject: [PATCH] 最新2 --- admin-web-master/src/components/editor/index.vue | 4 +++- admin-web-master/src/layout/index.vue | 10 +++++----- admin-web-master/src/utils/request.js | 2 +- admin-web-master/src/views/customer/yixiang/index.vue | 27 ++++++++++++--------------- ceres-uniapp-master/config/api.js | 3 ++- wenjuan-h5/config/api.js | 24 ++++++------------------ wenjuan-h5/pages_category_page1/question/question.vue | 4 +++- wenjuan-pc/src/utils/request.js | 4 ++-- wenjuan-pc/src/views/investigation/index.vue | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------- 9 files changed, 113 insertions(+), 100 deletions(-) diff --git a/admin-web-master/src/components/editor/index.vue b/admin-web-master/src/components/editor/index.vue index 281cec8..73decdd 100644 --- a/admin-web-master/src/components/editor/index.vue +++ b/admin-web-master/src/components/editor/index.vue @@ -177,5 +177,7 @@ value(newVule,old){ display: none; } } - +::v-deep .title{ + margin: 0 !important; +} diff --git a/admin-web-master/src/layout/index.vue b/admin-web-master/src/layout/index.vue index 9a2c8d2..44610e0 100644 --- a/admin-web-master/src/layout/index.vue +++ b/admin-web-master/src/layout/index.vue @@ -27,7 +27,7 @@ {{ name }} - +
- + @@ -27,14 +24,14 @@ - -
+ --> +
@@ -55,7 +52,7 @@ - + @@ -76,7 +73,7 @@ @current-change="handleCurrentChange" />
- +
- - + + @@ -317,7 +314,7 @@ - + @@ -342,7 +339,7 @@ @click="pipeiClose">重置 查询 - + diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js index 41a9fbf..aa714e5 100644 --- a/ceres-uniapp-master/config/api.js +++ b/ceres-uniapp-master/config/api.js @@ -1,6 +1,7 @@ const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' +const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/' // const DOMAIN_PREFIXPING = 'http://128.10.250.134:9003' // const DOMAIN_PREFIX = 'http://128.10.250.134:9007' const LIULIANG = 'https://jy.scjysm.asia:18086/liuliang' @@ -44,7 +45,7 @@ module.exports = { terminal: TERMINAL, // 画布设备 1 小程序，2 H5，3 App 4 电脑 SettledMerchantPrefix: 'https://jy.scjysm.asia:18086/cdwlMall/settled-merchant', //商家入驻链接 - shareLink: DOMAIN_PREFIX + '/cdwlMall/meh5', // 分享地址 + shareLink: TIAOZHUAN + 'meh5', // 分享地址 // shareLink: 'http://172.16.61.123:9007/h5', // 分享地址 diff --git a/wenjuan-h5/config/api.js b/wenjuan-h5/config/api.js index 29a66ed..696fd5f 100644 --- a/wenjuan-h5/config/api.js +++ b/wenjuan-h5/config/api.js @@ -1,33 +1,21 @@ -// const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/admin-server' -// const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/api' -// let DOMAIN_PREFIXPING = 'http://172.16.61.125:9003' -// let DOMAIN_PREFIX = 'http://172.16.61.125:9007' - - -// const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/meserver/admin-server' -// const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/meserver/api' -// const DOMAIN_PREFIXPING = 'http://172.16.61.123:80/cdwlMall/admin-server' -// const DOMAIN_PREFIX = 'http://172.16.61.123:80/cdwlMall/api' - -// const host = `${window.location.protocol}//${window.location.host}` -// const DOMAIN_PREFIXPING = `${host}/cdwlMall/admin-server` -// const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` let DOMAIN_PREFIXPING = `http://10.0.0.41:9003` let DOMAIN_PREFIX = 'http://10.0.0.41:9007' let host = window.location.host; let hostall = window.location.href; -if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { +if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:8082'|| host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { - DOMAIN_PREFIXPING = 'http://10.0.0.41:9003' - DOMAIN_PREFIX = 'http://10.0.0.41:9007' + // DOMAIN_PREFIXPING = 'http://10.0.0.41:9003' + DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + // DOMAIN_PREFIX = 'http://10.0.0.41:9007' } else { let c1 = hostall.split('cdwlMall')[0]; DOMAIN_PREFIXPING = `${c1}/cdwlMall/admin-server` - DOMAIN_PREFIX =`${c1}/cdwlMall/meserver/api` + DOMAIN_PREFIX =`${c1}/cdwlMall/meserver/api` } // #ifndef H5 const WX_API_BASE = DOMAIN_PREFIX // app diff --git a/wenjuan-h5/pages_category_page1/question/question.vue b/wenjuan-h5/pages_category_page1/question/question.vue index 9eee1e1..0d90e37 100644 --- a/wenjuan-h5/pages_category_page1/question/question.vue +++ b/wenjuan-h5/pages_category_page1/question/question.vue @@ -702,7 +702,9 @@ NET.request(API.wenjuanUp, tijiaoObj, 'post').then(res => { // this.show =true - + // if(){ + // https://jy.scjysm.asia:18086/h5-web/#/activity/pages/lottery/index?detailId=1892112909937541122&style=2 + // } if (res.data == 'false') { uni.reLaunch({ url: `/pages_category_page1/question/succe?chonfu=true` diff --git a/wenjuan-pc/src/utils/request.js b/wenjuan-pc/src/utils/request.js index d4868b5..fd25394 100644 --- a/wenjuan-pc/src/utils/request.js +++ b/wenjuan-pc/src/utils/request.js @@ -21,8 +21,8 @@ let hostall = window.location.href; if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; - baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; - // baseURL = 'http://172.16.61.123:9003'; + // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; + baseURL = 'http://128.10.249.21:9003'; // baseURL = 'http://172.16.61.125:9003'; // baseURL = 'http://192.168.2.36:9003'; // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; diff --git a/wenjuan-pc/src/views/investigation/index.vue b/wenjuan-pc/src/views/investigation/index.vue index a0b09f0..7566e51 100644 --- a/wenjuan-pc/src/views/investigation/index.vue +++ b/wenjuan-pc/src/views/investigation/index.vue @@ -359,19 +359,22 @@
参与答卷奖励
- + - {{ secondData.rewardForParticipation }} + {{ secondData.rewardForParticipation!=''?'转盘抽奖':'不设置奖励'}} - +
+ {{ secondData.rewardForParticipation!=''?'转盘抽奖活动':''}} + 查看 +
问卷题目
@@ -566,7 +569,7 @@ - 不设置奖励 @@ -580,16 +583,15 @@ 奖励 积分 --> -
- -
+
{{jiangli.name}} 查看 编辑
- 创建活动
@@ -606,15 +608,7 @@
- -
-