Explorar o código

Merge remote-tracking branch 'origin/master'

qinhouyu hai 1 ano
pai
achega
b2e174cd1b

+ 6 - 0
pages/handleAffairs/index.vue

@@ -234,6 +234,12 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 		background-color:#fff;
 		border-bottom: 2px solid #0CC689;
 	}
+	.uni-list .list-item{
+		height: 100%;
+	}
+	.uni-list-item{
+		height: 100%;
+	}
 	.uni-header-image {
 		width: 40px;
 		height: 40px;

+ 1 - 1
pages/handleAffairs/mattercontent/mattercontent.vue

@@ -233,7 +233,7 @@
 		width: 15vw;
 		height: 9vh;
 		border-radius: 50%;
-		position: absolute;
+		position: fixed;
 		background-color: #F1F1F1;
 		right: 3%;
 		bottom: 3%;

+ 1 - 1
pages/highServer/cooperative/addCooperative.vue

@@ -16,7 +16,7 @@
           <uni-easyinput v-model="customFormData.chargePeople" placeholder="请输入负责人姓名" />
         </uni-forms-item>
         <uni-forms-item label="图 片" required name="url" label-width="95">
-          <upload :imgArr="imageList" :fileSize="1" :limit="3" @updateImg="updateImg"/>
+          <upload :imgArr="imageList" :fileSize="1" :limit="1" @updateImg="updateImg"/>
         </uni-forms-item>
       </uni-forms>
       <button type="primary" @click="submit('customForm')">提交</button>

+ 0 - 3
pages/highServer/inquiryDetail/inquiryDetails.vue

@@ -105,9 +105,6 @@
 </script>
 <style lang="scss">
 	@import './inquiryDetails.css';
-    .container{
-		padding:50rpx;
-	}
 	.collect {
 		.icon-shoucang:before {
 			color: red;

+ 69 - 23
pages/highServer/service/service.vue

@@ -6,35 +6,35 @@
 		</view>
 		<view class="gpfwNav">
 			<ul>
-				<li>
+				<li @tap="goLvxd">
 					<view class="lvxd"><em class="iconfont icon-jurassic_nav"></em></view>
 					<span>旅游向导</span>
 				</li>
-				<li>
+				<li @tap="goXlzx">
 					<view class="xlzx"><em class="iconfont icon-xinlizixun"></em></view>
 					<span>心里咨询</span>
 				</li>
-				<li>
+				<li @tap="goXswz">
 					<view class="xswz"><em class="iconfont icon-wenzhen"></em></view>
 					<span>线上问诊</span>
 				</li>
 				<li>
 					<view @tap="goCooperative" class="gxs"><em class="iconfont icon-gongxiaoshelogo"></em></view>
-					<span @tap="goCooperative">供销社</span>
+					<span>供销社</span>
 				</li>
-				<li>
+				<li @tap="goBfjz">
 					<view class="xlzx"><em class="iconfont icon-linshijiuzhu"></em></view>
 					<span>帮扶救助</span>
 				</li>
-				<li>
+				<li @tap="goZsk">
 					<view class="xswz"><em class="iconfont icon-zhishi1"></em></view>
 					<span>知识库</span>
 				</li>
-				<li>
+				<li @tap="goZbdh">
 					<view class="lvxd"><em class="iconfont icon-zhibo"></em></view>
 					<span>直播带货</span>
 				</li>
-				<li>
+				<li @tap="goShfw">
 					<view class="more"><em class="iconfont life-pic"></em></view>
 					<span>生活服务</span>
 				</li>
@@ -87,58 +87,104 @@
 					url: '/pages/specialService/financialInfrastructure/financialInfrastructure'
 				});
 			},
+			goLvxd() {
+				uni.navigateTo({
+					url: '/pages/highServer/travelGuide/travelGuide'
+				});
+			},
+			goXlzx() {
+				uni.navigateTo({
+					url: '/pages/highServer/psychology/psychology'
+				});
+			},
+			goXswz() {
+				uni.navigateTo({
+					url: '/pages/highServer/inquiry/inquiry'
+				});
+			},
+			goBfjz() {
+				uni.navigateTo({
+					url: '/pages/highServer/help/help'
+				});
+			},
+			goZsk() {
+				uni.navigateTo({
+					url: '/pages/highServer/knowledge/knowledge'
+				});
+			},
+			goZbdh() {
+				uni.navigateTo({
+					url: '/pages/highServer/liveBroadcast/liveBroadcast'
+				});
+			},
+			goShfw() {
+				uni.navigateTo({
+					url: '/pages/highServer/lifeServices/lifeServices'
+				});
+			},
 		}
 	}
 </script>
 
 <style>
 	@import 'service.css';
-	.marriage-pic{
+
+	.marriage-pic {
 		background: url('../../../static/images/more/marriage.png') 0 0 no-repeat;
 		background-size: 100% 100%;
 	}
-	.legal-pic{
+
+	.legal-pic {
 		background: url('../../../static/images/more/legal.png') 0 0 no-repeat;
 		background-size: 100% 100%;
 	}
-	.system-pic{
+
+	.system-pic {
 		background: url('../../../static/images/more/system.png') 0 0 no-repeat;
 		background-size: 100% 100%;
 	}
-	.specialService-pic{
+
+	.specialService-pic {
 		background: url('../../../static/images/more/specialService.png') 0 0 no-repeat;
 		background-size: 100% 100%;
 	}
-	.life-pic{
+
+	.life-pic {
 		background: url('../../../static/images/more/lifeHelp.png') 0 0 no-repeat;
 		background-size: 80% 80%;
 		margin: 10% !important;
 	}
-	.titleLeftSecond::after{
-		content:'';
+
+	.titleLeftSecond::after {
+		content: '';
 		left: -109px;
 		width: 12vw;
 		background: url('../../../static/images/more/specialService.png') 0 0 no-repeat;
 		background-size: 93% 93%;
 		position: relative;
 	}
-	.gpfwNav ul li view.xchl{
+
+	.gpfwNav ul li view.xchl {
 		background: none;
 	}
-	.gpfwNav ul li view.flfw{
+
+	.gpfwNav ul li view.flfw {
 		background: none;
 	}
-	.gpfwNav ul li view.jrjj{
+
+	.gpfwNav ul li view.jrjj {
 		background: none;
 	}
-	.specialService{
+
+	.specialService {
 		width: 100% !important;
 	}
-	.specialService li{
+
+	.specialService li {
 		width: 20vh;
 	}
-	.specialService li view{
+
+	.specialService li view {
 		width: 100%;
 	}
-
-</style>
+</style>

+ 1 - 1
pages/highServer/travelGuideDetails/travelGuideDetails.vue

@@ -13,7 +13,7 @@
 				    </view>
 				</view>
 			</view>
-			<view class="wenzhangCont">
+			<view class="wenzhangCont article">
 				<view v-html="fromData.textDetails"></view>
 				<view v-for="(item, index) in fromData.pictureList" :key="index">
 					<image :src="loadImgSrcLocalhost(item)"></image>

+ 3 - 6
pages/index/index.vue

@@ -32,7 +32,7 @@
 			</view>
 			<view class="cnfl">
 				<view class="fv" @click="toLegal()">
-					<text>法律下</text>
+					<text>法律下</text>
 					<image :src="loadImgSrc('/fv.jpg')"></image>
 				</view>
 				<view class="hm" @click='toGovernmentList1'>
@@ -114,10 +114,7 @@
 					</li>
 					<li>
 						<view class="gxs" @tap="goCooperative"><em class="iconfont icon-gongxiaoshelogo"></em></view>
-						<!--<span>供销社</span>-->
-						<span @tap="goLoveAtVillage">供</span>
-						<span @tap="goLegalService">销</span>
-						<span @tap="goFinancialInfrastructure">社</span>
+						<span>供销社</span>
 					</li>
 					<li>
 						<view class="xlzx"><em class="iconfont icon-linshijiuzhu" @tap="gobfjz"></em></view>
@@ -209,7 +206,7 @@
 								<em>¥</em>
 								{{ item.integral }}
 							</span>
-							<span class="yjjg">¥500</span>
+							<!-- <span class="yjjg">¥500</span> -->
 						</view>
 					</view>
 				</li>

+ 0 - 1
pages/information/informationDetail/informationDetail.css

@@ -58,7 +58,6 @@
     line-height: 0;
 }
 .wenzhangCont {
-	width: 100vw;
     font-size: 34rpx;
     margin: 30rpx 0;
 }

+ 1 - 1
pages/specialService/financialInfrastructure/details.vue

@@ -25,7 +25,7 @@
 </template>
 
 <script>
-    import { getDetails } from '@/api/specialService/loveAtVillage.js';
+    import { getDetails } from '@/api/specialService/financialInfrastructure.js';
     export default {
         data() {
             return {

+ 39 - 0
uni.scss

@@ -94,3 +94,42 @@ image {
   line-height: 90rpx;
   width: 100%;
 }
+
+.ck{
+	position: absolute !important;
+	margin-left: 0 !important;
+	right: 30rpx !important;
+}
+.onePic{
+	width: 100% !important;
+	    height: 360rpx !important;
+	    border-radius: 20rpx !important;
+	    overflow: hidden !important;
+	    margin: 20rpx 0 !important;
+}
+.list {
+    border-bottom: solid 2rpx #f6f6f6 !important;
+    padding: 10rpx 0 !important;
+    width: 100% !important;
+}
+.onePic image {
+    width: 100% !important;
+    height: 100% !important;
+}
+.wenzhangLy {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    border-bottom: solid 2rpx #e8e8e8;
+    padding: 0 0 14rpx 0;
+}
+.wenzhangCont {
+    font-size: 34rpx;
+    margin: 30rpx 0;
+}
+.fengexian {
+    width: 100%;
+    height: 20rpx;
+    background: #f6f6f6;
+    border-radius: 6rpx;
+}