简柏林 / thingskit-app · Commits

Commit d321fa916129e99e4bdcdf2fe2ffd5508c71b0f4

Authored by xp.Huang
2 parents 86af3d56 1c92ca26

Merge branch 'ft-dev' into 'main' 

fix：移除意见反馈联系方式字段

See merge request huang/thingskit-app!69
Inline Side-by-side
Showing 7 changed files with 53 additions and 116 deletions
1 import { 1 import {
2 getTabbarHeight 2 getTabbarHeight
3 } from '@/plugins/utils'; 3 } from '@/plugins/utils';
4 -let baseUrl = "";  
5 -let baseDrawioUrl = ""  
6 -if (process.env.NODE_ENV === 'development') {  
7 - // 开发环境  
8 - // baseUrl = 'http://192.168.10.115:8080/api'  
9 - baseUrl = 'https://dev.thingskit.com/api'  
10 - baseDrawioUrl = 'https://dev.thingskit.com/thingskit-drawio'  
11 -} else if (process.env.NODE_ENV === 'production') {  
12 - // 生产环境  
13 - // baseUrl = 'http://47.99.141.212:8080/api'  
14 - baseUrl = 'https://dev.thingskit.com/api'  
15 - baseDrawioUrl = 'https://dev.thingskit.com/thingskit-drawio'  
16 -} 4 +let baseUrl = "https://dev.thingskit.com/api";
  5 +let baseDrawioUrl = "https://dev.thingskit.com/thingskit-drawio"
17 6
18 let systemInfo = { 7 let systemInfo = {
19 ...getTabbarHeight(), 8 ...getTabbarHeight(),
@@ -42,8 +31,8 @@ systemInfo.platform = 'plus' @@ -42,8 +31,8 @@ systemInfo.platform = 'plus'
42 console.log(systemInfo, 'systemInfo') 31 console.log(systemInfo, 'systemInfo')
43 const courtConfig = { 32 const courtConfig = {
44 publicAppId: '', //公众号appId 33 publicAppId: '', //公众号appId
45 - baseUrl: baseUrl, //域名  
46 - baseDrawioUrl: baseDrawioUrl, 34 + baseUrl, //域名
  35 + baseDrawioUrl,
47 systemInfo: systemInfo, //系统信息 36 systemInfo: systemInfo, //系统信息
48 mapData: { 37 mapData: {
49 key: '', //地图key 38 key: '', //地图key
1 -// /**  
2 -// * 需要修改  
3 -// */  
4 -// const APPID = 'wx99c411dc3c5571ef'  
5 -// const APPSECRECT = '606153abd59308b20a6e41fb6c852ad2'  
6 -  
7 -// module.exports = {  
8 -// appId: APPID,  
9 -// appSecrect: APPSECRECT,  
10 -// };  
@@ -11,15 +11,6 @@ @@ -11,15 +11,6 @@
11 <u-form-item required label="姓名" prop="feedbackInfo.name" borderBottom ref="item1"> 11 <u-form-item required label="姓名" prop="feedbackInfo.name" borderBottom ref="item1">
12 <u--input placeholder="请输入姓名" v-model="feedbackData.feedbackInfo.name" border="none"></u--input> 12 <u--input placeholder="请输入姓名" v-model="feedbackData.feedbackInfo.name" border="none"></u--input>
13 </u-form-item> 13 </u-form-item>
14 - <u-form-item label="手机" prop="feedbackInfo.phone" borderBottom ref="item1">  
15 - <u--input placeholder="请输入手机" v-model="feedbackData.feedbackInfo.phone" border="none"></u--input>  
16 - </u-form-item>  
17 - <u-form-item label="QQ" prop="feedbackInfo.qq" borderBottom ref="item1">  
18 - <u--input placeholder="请输入QQ" v-model="feedbackData.feedbackInfo.qq" border="none"></u--input>  
19 - </u-form-item>  
20 - <u-form-item label="邮箱" prop="feedbackInfo.email" borderBottom ref="item1">  
21 - <u--input placeholder="请输入邮箱" v-model="feedbackData.feedbackInfo.email" border="none"></u--input>  
22 - </u-form-item>  
23 <view class="info"> 14 <view class="info">
24 <view class="info-contain"> 15 <view class="info-contain">
25 <u-form-item required label="反馈" prop="feedbackInfo.message" borderBottom ref="item1"> 16 <u-form-item required label="反馈" prop="feedbackInfo.message" borderBottom ref="item1">
@@ -64,9 +55,6 @@ export default { @@ -64,9 +55,6 @@ export default {
64 feedbackInfo: { 55 feedbackInfo: {
65 title: '', 56 title: '',
66 name: '', 57 name: '',
67 - phone: '',  
68 - qq: '',  
69 - email: '',  
70 images: [], 58 images: [],
71 message: '' 59 message: ''
72 } 60 }
@@ -87,25 +75,6 @@ export default { @@ -87,25 +75,6 @@ export default {
87 message: '请填写姓名或者姓名格式错误', 75 message: '请填写姓名或者姓名格式错误',
88 trigger: ['blur', 'change'] 76 trigger: ['blur', 'change']
89 }, 77 },
90 - 'feedbackInfo.phone': {  
91 - type: 'number',  
92 - min: 11,  
93 - max:11,  
94 - message: '请填写手机或者手机格式错误',  
95 - trigger: ['blur', 'change']  
96 - },  
97 - 'feedbackInfo.qq': {  
98 - type: 'number',  
99 - min: 5,  
100 - max:10,  
101 - message: '请填写qq或者qq格式错误',  
102 - trigger: ['blur', 'change']  
103 - },  
104 - 'feedbackInfo.email': {  
105 - type: 'email',  
106 - message: '请填写邮箱或者邮箱格式错误',  
107 - trigger: ['blur', 'change']  
108 - },  
109 'feedbackInfo.message': { 78 'feedbackInfo.message': {
110 type: 'string', 79 type: 'string',
111 required: true, 80 required: true,
@@ -211,15 +180,9 @@ export default { @@ -211,15 +180,9 @@ export default {
211 .validate() 180 .validate()
212 .then(res => { 181 .then(res => {
213 if(res){ 182 if(res){
214 - let contactInfo = {  
215 - qq: this.feedbackData.feedbackInfo?.qq,  
216 - email: this.feedbackData.feedbackInfo?.email,  
217 - phone: this.feedbackData.feedbackInfo?.phone  
218 - };  
219 let httpData = { 183 let httpData = {
220 title: this.feedbackData.feedbackInfo.title, 184 title: this.feedbackData.feedbackInfo.title,
221 name: this.feedbackData.feedbackInfo.name, 185 name: this.feedbackData.feedbackInfo.name,
222 - contact: JSON.stringify(contactInfo),  
223 images: this.feedbackData.feedbackInfo.images.length == 0 ? '' : JSON.stringify(this.feedbackData.feedbackInfo.images), 186 images: this.feedbackData.feedbackInfo.images.length == 0 ? '' : JSON.stringify(this.feedbackData.feedbackInfo.images),
224 message: this.feedbackData.feedbackInfo.message 187 message: this.feedbackData.feedbackInfo.message
225 }; 188 };
1 <template> 1 <template>
2 <view class="status-page"> 2 <view class="status-page">
3 - <f-navbar navbarType="2" @leftClick="leftClick">  
4 - <view class="u-flex search-top" slot="left"> 3 + <view style="margin-left:15rpx;background-color: #f8f9fa;position:fixed;top:0rpx;z-index: 99999;">
  4 + <view style="height:35rpx;background-color: #f8f9fa;"></view>
  5 + <view class="u-flex search-top">
5 <view class="search-main"><u--input @change="inputChanged" prefixIcon="search" placeholder="请输入组态名称" border="surround" shape="circle"></u--input></view> 6 <view class="search-main"><u--input @change="inputChanged" prefixIcon="search" placeholder="请输入组态名称" border="surround" shape="circle"></u--input></view>
6 </view> 7 </view>
7 - </f-navbar> 8 + </view>
  9 + <view style="height:35rpx"></view>
8 <!-- 公共组件-每个页面必须引入 --> 10 <!-- 公共组件-每个页面必须引入 -->
9 <public-module></public-module> 11 <public-module></public-module>
  12 + <!-- 自带分页组件 -->
10 <mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback"> 13 <mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
11 - <view class="status-container">  
12 - <view @click="openConfigDetail(item.id)" v-for="(item, index) in list" :key="index" class="status-item u-flex">  
13 - <view style="cursor: pointer;" class="item-image"><image class="image" :src="item.icon || defaultConfigImage"></image></view>  
14 - <view class="item-text">  
15 - <text class="text">{{ item.name }}</text> 14 + <view class="configuation-container">
  15 + <view class="configuation-item">
  16 + <view @click="openConfigDetail(item.id)" v-for="(item, index) in list" :key="index" class="item">
  17 + <image class="image" :src="item.icon || defaultConfigImage"></image>
  18 + <text class="name">{{ item.name }}</text>
16 </view> 19 </view>
17 </view> 20 </view>
18 </view> 21 </view>
19 </mescroll-body> 22 </mescroll-body>
  23 + <!-- 自带分页组件 -->
  24 + <view style="height: 60rpx;"></view>
20 </view> 25 </view>
21 </template> 26 </template>
22 27
23 <script> 28 <script>
24 -import fNavbar from '@/components/module/f-navbar/f-navbar';  
25 import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js'; 29 import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
26 30
27 export default { 31 export default {
28 - components: {  
29 - fNavbar  
30 - },  
31 mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件) 32 mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
32 data() { 33 data() {
33 return { 34 return {
  35 + defaultConfigImage: '../../../static/test.png',
34 page: { 36 page: {
35 num: 0, 37 num: 0,
36 size: 10 38 size: 10
@@ -41,7 +43,6 @@ export default { @@ -41,7 +43,6 @@ export default {
41 upOption: { 43 upOption: {
42 auto: false // 不自动加载 44 auto: false // 不自动加载
43 }, 45 },
44 - defaultConfigImage: '../../../static/test.png',  
45 list: [] 46 list: []
46 }; 47 };
47 }, 48 },
@@ -87,17 +88,18 @@ export default { @@ -87,17 +88,18 @@ export default {
87 this.page.num += 1; 88 this.page.num += 1;
88 this.loadData(this.page.num); 89 this.loadData(this.page.num);
89 }, 90 },
90 - loadData(pageNo, T) { 91 + loadData(pageNo, organizationV) {
91 let httpData = { 92 let httpData = {
92 page: pageNo, 93 page: pageNo,
93 pageSize: 10, 94 pageSize: 10,
94 - name: T 95 + name: organizationV
95 }; 96 };
96 uni.$u.http 97 uni.$u.http
97 .get('/yt/configuration/center', { params: httpData, custom: { load: false } }) 98 .get('/yt/configuration/center', { params: httpData, custom: { load: false } })
98 .then(res => { 99 .then(res => {
99 uni.stopPullDownRefresh(); 100 uni.stopPullDownRefresh();
100 this.mescroll.endByPage(res.items.length, res.total); 101 this.mescroll.endByPage(res.items.length, res.total);
  102 + this.cameraTotal = res.total;
101 if (pageNo == 1) { 103 if (pageNo == 1) {
102 this.list = res.items; 104 this.list = res.items;
103 } else { 105 } else {
@@ -10,36 +10,35 @@ @@ -10,36 +10,35 @@
10 margin-top: -34rpx; 10 margin-top: -34rpx;
11 } 11 }
12 } 12 }
13 -}  
14 -.status-container {  
15 - width: 700rpx;  
16 - height: 250rpx;  
17 - display: flex;  
18 - flex-wrap: wrap;  
19 - align-content: space-between;  
20 - justify-content: space-between;  
21 - flex-direction: row;  
22 - .status-item {  
23 - width: 300rpx;  
24 - height: 250rpx;  
25 - margin: 23rpx;  
26 - background-color: #ffffff;  
27 - border-radius: 20px;  
28 - flex-direction: column;  
29 - justify-content: space-between;  
30 - .item-image {  
31 - margin-top: 38rpx;  
32 - .image {  
33 - width: 198rpx;  
34 - height: 119rpx;  
35 - }  
36 - }  
37 - .item-text {  
38 - position: relative;  
39 - top: -25rpx;  
40 - .text {  
41 - color: #333333;  
42 - font-size: 14px; 13 + .configuation-container {
  14 + .configuation-item {
  15 + width: 750rpx;
  16 + display: flex;
  17 + justify-content: space-between;
  18 + flex-wrap: wrap;
  19 + margin: 58rpx 0rpx 0rpx 6rpx;
  20 + .item {
  21 + width: 330rpx;
  22 + height: 288rpx;
  23 + background-color: #fff;
  24 + border-radius: 10px;
  25 + display: flex;
  26 + align-items: center;
  27 + justify-content: center;
  28 + flex-direction: column;
  29 + margin: 0rpx 43rpx 35rpx 0rpx;
  30 + .image {
  31 + width: 200rpx;
  32 + height: 144rpx;
  33 + }
  34 + .name {
  35 + font-size: 14px;
  36 + font-family: PingFangSC-Regular, PingFang SC;
  37 + font-weight: 400;
  38 + color: #333333;
  39 + line-height: 20px;
  40 + margin-top: 29rpx;
  41 + }
43 } 42 }
44 } 43 }
45 } 44 }
@@ -21,6 +21,7 @@ export const mutations = { @@ -21,6 +21,7 @@ export const mutations = {
21 // 退出APP 21 // 退出APP
22 emptyUserInfo(state) { 22 emptyUserInfo(state) {
23 state.userInfo = {}; 23 state.userInfo = {};
  24 + state.badgeInfo = 0;
24 // #ifdef H5 25 // #ifdef H5
25 window.sessionStorage.removeItem("userInfo"); 26 window.sessionStorage.removeItem("userInfo");
26 // #endif 27 // #endif
@@ -29,7 +30,7 @@ export const mutations = { @@ -29,7 +30,7 @@ export const mutations = {
29 uni.removeStorageSync('storagePre'); 30 uni.removeStorageSync('storagePre');
30 // #endif 31 // #endif
31 }, 32 },
32 - setBadgeInfo(state,payload){ 33 + setBadgeInfo(state, payload) {
33 state.badgeInfo = payload; 34 state.badgeInfo = payload;
34 } 35 }
35 }; 36 };
@@ -39,7 +40,6 @@ export const actions = { @@ -39,7 +40,6 @@ export const actions = {
39 state, 40 state,
40 commit 41 commit
41 }, data) { 42 }, data) {
42 - commit('setBadgeInfo',data)  
43 - console.log('Change total', data,state); 43 + commit('setBadgeInfo', data)
44 } 44 }
45 }; 45 };
@@ -10,12 +10,6 @@ @@ -10,12 +10,6 @@
10 </view> 10 </view>
11 <view style="height: 110rpx;"></view> 11 <view style="height: 110rpx;"></view>
12 <view class="notify-main"> 12 <view class="notify-main">
13 - <!-- 无数据图片 -->  
14 - <view v-if="list.length == 0" style="position: relative;top: 100rpx;flex-direction: column;" class="u-flex">  
15 - <view><image style="width: 280rpx;height: 250rpx;" src="../../static/empty.png"></image></view>  
16 - <view style="text-align: center;"><text style="font-size: 12px;color: gray;">~ 空空如也 ~</text></view>  
17 - </view>  
18 - <!-- 无数据图片 -->  
19 <mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback"> 13 <mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
20 <view class="u-flex main"> 14 <view class="u-flex main">
21 <view @click="clickNotifyDetail(item, index)" class="u-flex main-item" v-for="(item, index) in list" :key="index"> 15 <view @click="clickNotifyDetail(item, index)" class="u-flex main-item" v-for="(item, index) in list" :key="index">