小程序20221028版本提交

env.js

@@ -1,14 +1,14 @@
 const ENV_API_URL = {
 	development: {
-		// url: 'https://fuyu.scapp.cn/wx-api/api',
-		url: 'http://192.168.0.63/wx-api/api',
+		url: 'https://fuyu.scapp.cn/wx-api/api',
+		// url: 'http://192.168.0.63/wx-api/api',
 		imgUrl: 'https://fuyu.scapp.cn/static/wxa/',
-		fileUrl: 'http://192.168.0.63'
+		fileUrl: 'https://fuyu.scapp.cn'
 	},
 	production: {
 		url: 'https://fuyu.scapp.cn/wx-api/api',
 		imgUrl: 'https://fuyu.scapp.cn/static/wxa/',
-		fileUrl: 'http://192.168.0.63'
+		fileUrl: 'https://fuyu.scapp.cn'
 	},
 }
 export const BASE_URL = ENV_API_URL[process.env.NODE_ENV || 'development'];

pages/activity/details.vue

@@ -73,11 +73,16 @@
 				const newDateTime = new Date().getTime();
 				const isTime = Date.parse(res.data.regEndTime);
 				const startTime = Date.parse(res.data.regStartTime);
+				const startActiveTime = Date.parse(res.data.startTime);
+
+				// 报名按钮状态设置
 				if (!statusInfo.status) {
 					this.buttonGroup[0].backgroundColor = '#ff0000';
 					this.buttonGroup[0].text = '报名活动';
 					delete this.buttonGroup[0].status
 					delete this.buttonGroup[0].disable
+					this.buttonGroup[1].disable = true;
+					this.buttonGroup[1].backgroundColor = '#999';
 				}
 				if (statusInfo.status) {
 					this.buttonGroup[0].backgroundColor = '#999';
@@ -96,12 +101,30 @@
 					this.buttonGroup[0].text = '报名已结束';
 					this.buttonGroup[0].disable = true;
 				}
-				if (res.data.status == 0) res.data.statusText = '活动未开始';
-				if (res.data.status == 3) res.data.statusText = '活动已结束';
-				this.buttonGroup[1].text = res.data.statusText;
-				if (res.data.status == 0 || res.data.status == 3 || !statusInfo.status) {
+
+				// 活动状态及积分获取按钮状态
+				if (res.data.status == 3) {
+					this.buttonGroup[1].text = '活动已结束';
 					this.buttonGroup[1].backgroundColor = '#999';
 					this.buttonGroup[1].disable = true;
+
+				}else if(res.data.status == 0) {
+					if(newDateTime < startActiveTime){
+						this.buttonGroup[1].text = '活动未开始';
+						this.buttonGroup[1].backgroundColor = '#999';
+						this.buttonGroup[1].disable = true;		
+					}else{
+						console.log(statusInfo.status, 'statusInfo.status')
+						if(statusInfo.status){
+							this.buttonGroup[1].text = '获取积分';
+							this.buttonGroup[1].backgroundColor = '#ffa200';
+							delete this.buttonGroup[1].disable;
+						}else{
+							this.buttonGroup[1].text = '活动进行中';
+							this.buttonGroup[1].backgroundColor = '#999';
+							this.buttonGroup[1].disable = true;	
+						}						
+					}
 				}
 			},
 			buttonClick(e) {

pages/activity/index.vue

@@ -48,7 +48,7 @@
 				this.page += 1;
 				this.more = 'loading';
 				const res = await request.getActivity({ pageNum: this.page, pageSize: this.size });
-				res.rows.map(e => {
+				res.rows?.map(e => {
 					if (e.status == 0) e.statusText = '未开始';
 					// if (e.status == 1) e.statusText = '进行中';
 					if (e.status == 2) e.statusText = '已结束';

pages/index/index.vue

@@ -69,6 +69,7 @@
 			},
 			illnessBtn(e) {
 				const role = uni.getStorageSync('role');
+				console.log(role, 'role')
 				if (e.isUser && role && role == 'guest') {
 					uni.navigateTo({
 						url: `/pages/register/index?path=${e.path}`

pages/questionnaire/web.vue

@@ -6,7 +6,7 @@
 	export default {
 		onLoad: function (option) {
 			const token = uni.getStorageSync('token');
-			this.url = `${option.url}?token=Bearer ${token}`;
+			this.url = `${option.url}?token=${token}`;
 		},
 		data() {
 			return {

pages/service/index.vue

@@ -40,7 +40,7 @@
 	.card {
 		display: block;
 		margin: 10px;
-		width: 28%;
+		width: 27%;
 	}
 	.cover {
 		display: block;

unpackage/dist/build/mp-weixin/app.json

@@ -5,7 +5,6 @@
     "pages/service/index",
     "pages/policy/index",
     "pages/illness/index",
-    "pages/illness/come",
     "pages/illness/receive",
     "pages/illness/testingRoom",
     "pages/details/index",
@@ -13,13 +12,20 @@
     "pages/notice/index",
     "pages/user/index",
     "pages/user/familyInfo",
-    "pages/register/index"
+    "pages/register/index",
+    "pages/questionnaire/index",
+    "pages/questionnaire/details",
+    "pages/questionnaire/web",
+    "pages/integral/index",
+    "pages/activity/index",
+    "pages/activity/details",
+    "pages/activity/uploadFiel"
   ],
   "subPackages": [],
   "window": {
     "navigationBarTextStyle": "white",
     "navigationBarTitleText": "uni-app",
-    "navigationBarBackgroundColor": "#fd6b18",
+    "navigationBarBackgroundColor": "#c60814",
     "backgroundColor": "#fff"
   },
   "tabBar": {
@@ -38,13 +44,13 @@
         "pagePath": "pages/service/index",
         "iconPath": "static/service1.png",
         "selectedIconPath": "static/service2.png",
-        "text": "服务"
+        "text": "政务服务"
       },
       {
         "pagePath": "pages/policy/index",
         "iconPath": "static/policy1.png",
         "selectedIconPath": "static/policy2.png",
-        "text": "政策"
+        "text": "党建引领"
       },
       {
         "pagePath": "pages/my/index",

unpackage/dist/build/mp-weixin/components/gaoyia-parse/components/wxParseAudio.wxml

@@ -0,0 +1 @@
+<audio class="{{[node.classStr]}}" style="{{(node.styleStr)}}" id="{{node.attr.id}}" src="{{node.attr.src}}" loop="{{node.attr.loop}}" poster="{{node.attr.poster}}" name="{{node.attr.name}}" author="{{node.attr.author}}" controls="{{true}}"></audio>

unpackage/dist/build/mp-weixin/components/gaoyia-parse/components/wxParseImg.wxml

@@ -0,0 +1 @@
+<image class="{{[node.classStr]}}" style="{{(newStyleStr||node.styleStr)}}" mode="{{node.attr.mode}}" lazy-load="{{node.attr.lazyLoad}}" data-src="{{node.attr.src}}" src="{{node.attr.src}}" data-event-opts="{{[['tap',[['wxParseImgTap',['$event']]]],['load',[['wxParseImgLoad',['$event']]]]]}}" bindtap="__e" bindload="__e"></image>

unpackage/dist/build/mp-weixin/components/gaoyia-parse/components/wxParseTable.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

unpackage/dist/build/mp-weixin/components/gaoyia-parse/components/wxParseTable.wxml

@@ -0,0 +1 @@
+<view class="tablebox _div"><rich-text class="{{[node.classStr]}}" style="{{('user-select:'+parseSelect)}}" nodes="{{nodes}}"></rich-text></view>

unpackage/dist/build/mp-weixin/components/gaoyia-parse/components/wxParseTemplate0.json

@@ -0,0 +1,10 @@
+{
+  "component": true,
+  "usingComponents": {
+    "weixin-parse-template": "/components/gaoyia-parse/components/wxParseTemplate1",
+    "weixin-parse-img": "/components/gaoyia-parse/components/wxParseImg",
+    "weixin-parse-video": "/components/gaoyia-parse/components/wxParseVideo",
+    "weixin-parse-audio": "/components/gaoyia-parse/components/wxParseAudio",
+    "weixin-parse-table": "/components/gaoyia-parse/components/wxParseTable"
+  }
+}

unpackage/dist/build/mp-weixin/components/gaoyia-parse/components/wxParseTemplate1.json

@@ -0,0 +1,10 @@
+{
+  "component": true,
+  "usingComponents": {
+    "weixin-parse-template": "/components/gaoyia-parse/components/wxParseTemplate2",
+    "weixin-parse-img": "/components/gaoyia-parse/components/wxParseImg",
+    "weixin-parse-video": "/components/gaoyia-parse/components/wxParseVideo",
+    "weixin-parse-audio": "/components/gaoyia-parse/components/wxParseAudio",
+    "weixin-parse-table": "/components/gaoyia-parse/components/wxParseTable"
+  }
+}

unpackage/dist/build/mp-weixin/components/gaoyia-parse/components/wxParseTemplate10.json

@@ -0,0 +1,10 @@
+{
+  "component": true,
+  "usingComponents": {
+    "weixin-parse-template": "/components/gaoyia-parse/components/wxParseTemplate11",
+    "weixin-parse-img": "/components/gaoyia-parse/components/wxParseImg",
+    "weixin-parse-video": "/components/gaoyia-parse/components/wxParseVideo",
+    "weixin-parse-audio": "/components/gaoyia-parse/components/wxParseAudio",
+    "weixin-parse-table": "/components/gaoyia-parse/components/wxParseTable"
+  }
+}

unpackage/dist/build/mp-weixin/components/gaoyia-parse/components/wxParseTemplate11.json

@@ -0,0 +1,9 @@
+{
+  "component": true,
+  "usingComponents": {
+    "weixin-parse-img": "/components/gaoyia-parse/components/wxParseImg",
+    "weixin-parse-video": "/components/gaoyia-parse/components/wxParseVideo",
+    "weixin-parse-audio": "/components/gaoyia-parse/components/wxParseAudio",
+    "weixin-parse-table": "/components/gaoyia-parse/components/wxParseTable"
+  }
+}

unpackage/dist/build/mp-weixin/components/gaoyia-parse/components/wxParseTemplate2.json

@@ -0,0 +1,10 @@
+{
+  "component": true,
+  "usingComponents": {
+    "weixin-parse-template": "/components/gaoyia-parse/components/wxParseTemplate3",
+    "weixin-parse-img": "/components/gaoyia-parse/components/wxParseImg",
+    "weixin-parse-video": "/components/gaoyia-parse/components/wxParseVideo",
+    "weixin-parse-audio": "/components/gaoyia-parse/components/wxParseAudio",
+    "weixin-parse-table": "/components/gaoyia-parse/components/wxParseTable"
+  }
+}

unpackage/dist/build/mp-weixin/components/gaoyia-parse/components/wxParseTemplate3.json

@@ -0,0 +1,10 @@
+{
+  "component": true,
+  "usingComponents": {
+    "weixin-parse-template": "/components/gaoyia-parse/components/wxParseTemplate4",
+    "weixin-parse-img": "/components/gaoyia-parse/components/wxParseImg",
+    "weixin-parse-video": "/components/gaoyia-parse/components/wxParseVideo",
+    "weixin-parse-audio": "/components/gaoyia-parse/components/wxParseAudio",
+    "weixin-parse-table": "/components/gaoyia-parse/components/wxParseTable"
+  }
+}

unpackage/dist/build/mp-weixin/components/gaoyia-parse/components/wxParseTemplate4.json

@@ -0,0 +1,10 @@
+{
+  "component": true,
+  "usingComponents": {
+    "weixin-parse-template": "/components/gaoyia-parse/components/wxParseTemplate5",
+    "weixin-parse-img": "/components/gaoyia-parse/components/wxParseImg",
+    "weixin-parse-video": "/components/gaoyia-parse/components/wxParseVideo",
+    "weixin-parse-audio": "/components/gaoyia-parse/components/wxParseAudio",
+    "weixin-parse-table": "/components/gaoyia-parse/components/wxParseTable"
+  }
+}

unpackage/dist/build/mp-weixin/components/gaoyia-parse/components/wxParseTemplate5.json

@@ -0,0 +1,10 @@
+{
+  "component": true,
+  "usingComponents": {
+    "weixin-parse-template": "/components/gaoyia-parse/components/wxParseTemplate6",
+    "weixin-parse-img": "/components/gaoyia-parse/components/wxParseImg",
+    "weixin-parse-video": "/components/gaoyia-parse/components/wxParseVideo",
+    "weixin-parse-audio": "/components/gaoyia-parse/components/wxParseAudio",
+    "weixin-parse-table": "/components/gaoyia-parse/components/wxParseTable"
+  }
+}

unpackage/dist/build/mp-weixin/components/gaoyia-parse/components/wxParseTemplate6.json

@@ -0,0 +1,10 @@
+{
+  "component": true,
+  "usingComponents": {
+    "weixin-parse-template": "/components/gaoyia-parse/components/wxParseTemplate7",
+    "weixin-parse-img": "/components/gaoyia-parse/components/wxParseImg",
+    "weixin-parse-video": "/components/gaoyia-parse/components/wxParseVideo",
+    "weixin-parse-audio": "/components/gaoyia-parse/components/wxParseAudio",
+    "weixin-parse-table": "/components/gaoyia-parse/components/wxParseTable"
+  }
+}

unpackage/dist/build/mp-weixin/components/gaoyia-parse/components/wxParseTemplate7.json

@@ -0,0 +1,10 @@
+{
+  "component": true,
+  "usingComponents": {
+    "weixin-parse-template": "/components/gaoyia-parse/components/wxParseTemplate8",
+    "weixin-parse-img": "/components/gaoyia-parse/components/wxParseImg",
+    "weixin-parse-video": "/components/gaoyia-parse/components/wxParseVideo",
+    "weixin-parse-audio": "/components/gaoyia-parse/components/wxParseAudio",
+    "weixin-parse-table": "/components/gaoyia-parse/components/wxParseTable"
+  }
+}

unpackage/dist/build/mp-weixin/components/gaoyia-parse/components/wxParseTemplate8.json

@@ -0,0 +1,10 @@
+{
+  "component": true,
+  "usingComponents": {
+    "weixin-parse-template": "/components/gaoyia-parse/components/wxParseTemplate9",
+    "weixin-parse-img": "/components/gaoyia-parse/components/wxParseImg",
+    "weixin-parse-video": "/components/gaoyia-parse/components/wxParseVideo",
+    "weixin-parse-audio": "/components/gaoyia-parse/components/wxParseAudio",
+    "weixin-parse-table": "/components/gaoyia-parse/components/wxParseTable"
+  }
+}

unpackage/dist/build/mp-weixin/components/gaoyia-parse/components/wxParseTemplate9.json

@@ -0,0 +1,10 @@
+{
+  "component": true,
+  "usingComponents": {
+    "weixin-parse-template": "/components/gaoyia-parse/components/wxParseTemplate10",
+    "weixin-parse-img": "/components/gaoyia-parse/components/wxParseImg",
+    "weixin-parse-video": "/components/gaoyia-parse/components/wxParseVideo",
+    "weixin-parse-audio": "/components/gaoyia-parse/components/wxParseAudio",
+    "weixin-parse-table": "/components/gaoyia-parse/components/wxParseTable"
+  }
+}

unpackage/dist/build/mp-weixin/components/gaoyia-parse/components/wxParseVideo.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

unpackage/dist/build/mp-weixin/components/gaoyia-parse/components/wxParseVideo.wxml

@@ -0,0 +1 @@
+<view class="{{[node.classStr]}}" style="{{(node.styleStr)}}"><video class="{{['video-video',node.classStr]}}" style="{{(node.styleStr)}}" src="{{node.attr.src}}"></video></view>

unpackage/dist/build/mp-weixin/components/gaoyia-parse/parse.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "weixin-parse-template": "/components/gaoyia-parse/components/wxParseTemplate0"
+  }
+}

unpackage/dist/build/mp-weixin/components/gaoyia-parse/parse.wxml

@@ -0,0 +1 @@
+<view class="{{['wxParse','_div',className]}}" style="{{('user-select:'+userSelect)}}"><block wx:for="{{nodes}}" wx:for-item="node" wx:for-index="index" wx:key="index"><block wx:if="{{!loading}}"><block><weixin-parse-template vue-id="{{'909f9976-1-'+index}}" node="{{node}}" bind:__l="__l"></weixin-parse-template></block></block></block></view>

unpackage/dist/build/mp-weixin/pages/activity/details.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "活动详情",
+  "usingComponents": {
+    "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
+    "uni-list": "/uni_modules/uni-list/components/uni-list/uni-list",
+    "uni-list-item": "/uni_modules/uni-list/components/uni-list-item/uni-list-item",
+    "uni-goods-nav": "/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav"
+  }
+}

unpackage/dist/build/mp-weixin/pages/activity/details.wxss

@@ -0,0 +1 @@
+.container{position:relative;padding-bottom:12vw;background-color:#fff}.banner{width:100%;height:50vw}.content{display:block;width:90%;margin:10px auto}.goodNav{width:100%;height:12vw;position:fixed;left:0;bottom:0}

unpackage/dist/build/mp-weixin/pages/activity/index.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "活动列表",
+  "usingComponents": {
+    "uni-list": "/uni_modules/uni-list/components/uni-list/uni-list",
+    "uni-list-item": "/uni_modules/uni-list/components/uni-list-item/uni-list-item",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
+    "uni-load-more": "/uni_modules/uni-load-more/components/uni-load-more/uni-load-more"
+  }
+}

unpackage/dist/build/mp-weixin/pages/activity/index.wxss

@@ -0,0 +1 @@
+.slot-box{position:relative}.slot-image{width:70px;height:70px}.status{position:absolute;left:0;top:0;font-size:12px;color:#fff;background:#999}.slot-body{width:70%;margin-left:10px}.slot-title{font-size:1.2em;font-weight:600;color:#000;line-height:1.5em}.slot-text{font-size:14px;color:#999;line-height:3em}.footerIcon{line-height:4em}

unpackage/dist/build/mp-weixin/pages/activity/uploadFiel.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "获取积分",
+  "usingComponents": {}
+}

unpackage/dist/build/mp-weixin/pages/activity/uploadFiel.wxss

@@ -0,0 +1 @@
+.upload{width:85px;height:85px;border-radius:12px;border:1px solid #999;margin:10px 0;margin-right:5px;background:#dadada}.xiangji{display:block;width:40px;height:40px;margin:25px auto}.uploadItem{display:flex;position:relative}.uploadImg{width:100%;height:100%;display:block;border-radius:12px;overflow:hidden}.uploadBox{display:flex;width:90%;margin:5px auto;flex-wrap:wrap}.imgx{width:15px;height:15px;position:absolute;top:-5px;right:-5px}.submit{width:90%;margin:25px auto}

unpackage/dist/build/mp-weixin/pages/details/cmsinfo.json

@@ -1,4 +1,7 @@
 {
   "navigationBarTitleText": "详情",
-  "usingComponents": {}
+  "navigationStyle": "custom",
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  }
 }

unpackage/dist/build/mp-weixin/pages/details/cmsinfo.wxml

@@ -1 +1 @@
-<view class="container"><rich-text class="content" image-menu-prevent="true" nodes="{{info.content||info.noticeContent}}"></rich-text></view>
+<view class="container"><view class="title" style="{{'height:'+(height+'px')+';'+('line-height:'+(height+'px')+';')+('padding-top:'+(top+'px')+';')}}"><uni-icons class="back" vue-id="deb3c236-1" color="#fff" type="back" size="25" data-event-opts="{{[['^click',[['back']]]]}}" bind:click="__e" bind:__l="__l"></uni-icons><text>{{info.title}}</text></view><rich-text class="content" image-menu-prevent="true" nodes="{{info.content||info.noticeContent}}"></rich-text></view>

unpackage/dist/build/mp-weixin/pages/details/cmsinfo.wxss

@@ -1 +1 @@
-.time{width:100%;text-align:center;display:block;font-size:12px}.content{display:block;width:90%;margin:10px auto}
+.title{display:flex;color:#fff;background-color:#fd6b18}.back{margin:0 15px 0 5px}.time{width:100%;text-align:center;display:block;font-size:12px}.content{display:block;width:90%;margin:10px auto}

unpackage/dist/build/mp-weixin/pages/illness/come.json

@@ -1,4 +0,0 @@
-{
-  "navigationBarTitleText": "返（来）长报备",
-  "usingComponents": {}
-}

unpackage/dist/build/mp-weixin/pages/illness/come.wxml

@@ -1 +0,0 @@
-<view class="container"><text class="intro">come</text></view>

unpackage/dist/build/mp-weixin/pages/illness/receive.json

@@ -1,12 +1,10 @@
 {
   "navigationBarTitleText": "家庭成员",
   "usingComponents": {
-    "uni-segmented-control": "/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control",
     "uni-card": "/uni_modules/uni-card/components/uni-card/uni-card",
     "uni-list": "/uni_modules/uni-list/components/uni-list/uni-list",
     "uni-list-item": "/uni_modules/uni-list/components/uni-list-item/uni-list-item",
     "uni-list-chat": "/uni_modules/uni-list/components/uni-list-chat/uni-list-chat",
-    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
-    "uni-tag": "/uni_modules/uni-tag/components/uni-tag/uni-tag"
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
   }
 }

unpackage/dist/build/mp-weixin/pages/integral/index.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "我的积分",
+  "usingComponents": {}
+}

unpackage/dist/build/mp-weixin/pages/policy/index.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "政策",
+  "navigationBarTitleText": "党建引领",
   "enablePullDownRefresh": true,
   "usingComponents": {
     "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",