Merge branch 'master' of http://192.168.10.18:3000/sooka_shop/sooka_consult_uniapp

data/json.js

@@ -34,7 +34,7 @@ var qbwd = [
             }
         ],
         jf: '300',
-        ly: '30',
+        pl: '20',
         title: '探索乡村能源供给新模式 绘就乡村振兴美丽新画卷'
     },
     {
@@ -106,7 +106,7 @@ var jcwd = [
             }
         ],
         jf: '300',
-        ly: '30',
+        pl: '20',
         title: '探索乡村能源供给新模式 绘就乡村振兴美丽新画卷'
     },
     {
@@ -219,7 +219,7 @@ var zdxs = [
             }
         ],
         jf: '300',
-        ly: '30',
+        pl: '20',
         title: '探索乡村能源供给新模式 绘就乡村振兴美丽新画卷'
     },
     {
@@ -345,7 +345,7 @@ var index = [
             }
         ],
         jf: '300',
-        ly: '30',
+        pl: '20',
         title: '探索乡村能源供给新模式 绘就乡村振兴美丽新画卷'
     },
     {

pages.json

@@ -15,15 +15,15 @@
 				"navigationBarTitleText": "新增供销社信息"
 			}
 		},
-		// {
-		// 	"path": "pages/highServer/cooperative/cooperative",
-		// 	"style": {
-		// 		"usingComponents": {},
-		// 		"navigationBarBackgroundColor": "#07c160",
-		// 		"navigationBarTextStyle": "white",
-		// 		"navigationBarTitleText": "供销社"
-		// 	}
-		// },
+		 {
+		 	"path": "pages/highServer/cooperative/cooperative",
+		 	"style": {
+		 		"usingComponents": {},
+		 		"navigationBarBackgroundColor": "#07c160",
+		 		"navigationBarTextStyle": "white",
+		 		"navigationBarTitleText": "供销社"
+		 	}
+		 },
 		{
 			"path": "pages/specialService/loveAtVillage/loveAtVillage",
 			"style": {

pages/demo/sannong/sannong.vue

@@ -9,7 +9,6 @@
                     <view class="rnwdList">
                         <view class="list" @tap="goDetails" v-for="(item, index1) in qbwd" :key="index1">
                             <span class="listTitle">{{ item.title }}</span>
-
                             <view class="onePic" v-if="item.imgList.length == 1">
                                 <image :src="loadImgSrc(item.url)" v-for="(item, index2) in item.imgList" :key="index2"></image>
                             </view>

pages/demo/wenba/wenba.vue

@@ -69,16 +69,11 @@
 
             <em class="iconfont icon-xiangyoujiantou"></em>
         </view>
-		<upload :imgArr="imageList" :fileSize="1" :limit="3" @updateImg="updateImg"></upload>
     </view>
 </template>
 
 <script>
-import upload from '../../../components/upload/index.vue'
 export default {
-	components: {
-		upload
-	},
     data() {
         return {
 			imageList:[

pages/handleAffairs/index.vue

@@ -16,9 +16,8 @@
 					<swiper-item v-for="(item ,index) in gridtType" :key="index">
 						<uni-grid :column="5" :highlight="true" :showBorder="false">
 							<uni-grid-item v-for="(dataitem,dataindex) in item" :key="dataitem.id">
-								<view>
-									<image class="uni-header-image" :src="loadImgSrcLocalhost(dataitem.fileUrl)"
-										@click="querygrid(dataitem)"></image>
+								<view  @click="querygrid(dataitem)">
+									<image class="uni-header-image" :src="loadImgSrcLocalhost(dataitem.fileUrl)"></image>
 									<uni-title type="h5" :title="dataitem.name" align="center"></uni-title>
 								</view>
 							</uni-grid-item>

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>

pages/highServer/cooperative/cooperative.vue

@@ -2,9 +2,9 @@
     <view class="container">
         <!-- 供销社列表 -->
         <view class="rnwdList" v-for="(item, index) in list" :key="index">
-            <view @tap="goDetails(item.id)" class="cooperativeImgBox">
+            <view @tap="goDetails(item.id)" class="cooperativeImgBox" style="width: 30%;">
                 <!--<image :src="loadImgSrc('/snbj.png')" class="cooperativeImg"></image>-->
-                <image :src="loadImgSrc(item.imgUrl)" class="cooperativeImg"></image>
+                <image :src="loadImgSrcLocalhost(item.imgUrl)" class="cooperativeImg"></image>
             </view>
             <view @tap="goDetails(item.id)" class="cooperativeBox">
                 <view class="list">
@@ -53,6 +53,7 @@ export default {
                     imgUrl:"-"
                 }
             ],
+			total:0
         };
     },
     onPullDownRefresh() {
@@ -92,6 +93,7 @@ export default {
         getList(type) {
             this.loading = true;
             getList().then(response => {
+				this.total = response.total
                 if (this.queryParams.pageNum === 1) {
                     this.list = response.rows;
                 } else {

pages/highServer/cooperative/details.css

@@ -1,5 +1,5 @@
 .container{
-    padding: 0;
+    padding: 0 20rpx;
 }
 
 .cooperativeImgBox{
@@ -8,7 +8,7 @@
     top: 0;
     z-index: 0;
     width: 100%;
-    height: 480rpx;
+    height: 400rpx;
 }
 .cooperativeImg{
     position: static;
@@ -24,13 +24,15 @@
     font-size: 50rpx;
 }
 .itemBox:nth-child(2n-1){
-    background: #ccc;
+    background: #e4e4e4;
 }
 .itemBox:nth-child(2n){
-    background: #ddd;
+    background: #eee;
 }
 
 .item{
+	font-size: 30rpx;
+	padding: 20rpx;
     /*width: 100%;*/
     /*background-color: #57f5a1;*/
 }

pages/highServer/cooperative/details.vue

@@ -3,7 +3,7 @@
         <!-- 供销社详情 -->
         <view class="cooperativeImgBox">
             <!--<image :src="loadImgSrc('/snbj.png')" class="cooperativeImg"></image>-->
-            <image :src="loadImgSrc(imgUrl)" class="cooperativeImg"></image>
+            <image :src="loadImgSrcLocalhost(imgUrl)" class="cooperativeImg"></image>
         </view>
         <view class="itemBox" v-for="(item, index) in list" :key="index">
             <view class="item">

pages/highServer/inquiry/inquiry.css

@@ -51,9 +51,10 @@
     height: 100%;
 }
 .list {
-    border-bottom: solid 2rpx #f6f6f6;
-    padding: 10rpx 0;
-    width: 100%;
+	border-bottom: solid 2rpx #f6f6f6;
+	padding: 20rpx 0;
+	width: 100%;
+	
 }
 .lb {
     background: #0d9970;
@@ -133,4 +134,8 @@
 .ck {
     color: #c4c4c4;
 	margin-left:240px;
+}
+.f-r {
+	position: absolute;
+	right: 30rpx;
 }

pages/highServer/inquiry/inquiry.vue

@@ -23,7 +23,7 @@
 				</view>
 
 				<view class="jlSj">
-					<view class="ck">
+					<view class="ck f-r">
 						<span>
 							<em class="iconfont icon-chakan"></em>
 							{{ item.likeNum }}

pages/highServer/inquiryDetail/inquiryDetails.css

@@ -1,4 +1,5 @@
 /* pages/wenbaxiangqing.wxss */
+
 .title {
     font-size: 44rpx;
     text-align: center;

pages/highServer/inquiryDetail/inquiryDetails.vue

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

pages/highServer/service/service.vue

@@ -6,37 +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 class="gxs" @tap="goCooperative"><em class="iconfont icon-gongxiaoshelogo"></em></view>
-					<span @tap="goLoveAtVillage">供</span>
-					<span @tap="goLegalService">销</span>
-					<span @tap="goFinancialInfrastructure">社</span>
+					<view @tap="goCooperative" class="gxs"><em class="iconfont icon-gongxiaoshelogo"></em></view>
+					<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>
@@ -49,16 +47,16 @@
 		<view class="gpfwNav specialService">
 			<ul>
 				<li>
-					<view class="xchl"><em class="iconfont marriage-pic"></em></view>
-					<span>乡村婚恋</span>
+					<view @tap="goLoveAtVillage" class="xchl"><em class="iconfont marriage-pic"></em></view>
+					<span @tap="goLoveAtVillage">乡村婚恋</span>
 				</li>
 				<li>
-					<view class="flfw"><em class="iconfont legal-pic"></em></view>
-					<span>法律服务</span>
+					<view @tap="goLegalService" class="flfw"><em class="iconfont legal-pic"></em></view>
+					<span @tap="goLegalService">法律服务</span>
 				</li>
 				<li>
-					<view class="jrjj"><em class="iconfont system-pic"></em></view>
-					<span>金融基建</span>
+					<view @tap="goFinancialInfrastructure" class="jrjj"><em class="iconfont system-pic"></em></view>
+					<span @tap="goFinancialInfrastructure">金融基建</span>
 				</li>
 			</ul>
 		</view>
@@ -67,56 +65,126 @@
 </template>
 
 <script>
+	export default {
+		methods: {
+			goCooperative() {
+				uni.navigateTo({
+					url: '/pages/highServer/cooperative/cooperative'
+				});
+			},
+			goLoveAtVillage() {
+				uni.navigateTo({
+					url: '/pages/specialService/loveAtVillage/loveAtVillage'
+				});
+			},
+			goLegalService() {
+				uni.navigateTo({
+					url: '/pages/specialService/legalService/legalService'
+				});
+			},
+			goFinancialInfrastructure() {
+				uni.navigateTo({
+					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>

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>

pages/index/announcementList.vue

@@ -4,7 +4,7 @@
 			<uni-search-bar :focus="false" v-model="title"  @input="search" @cancel="cancel" clearButton="auto" cancelButton="none"></uni-search-bar>
 		</view>
 		<view v-for="(item, index) in list" :key="item.id" class="item">
-			<img :src="loadImgSrc(`${item.announcementImg}`)" class="avatar" />
+			<img :src="loadImgSrcLocalhost(`${item.announcementImg}`)" class="avatar" />
 			<view class="info" style="height: 5em;">
 				<view class="name" @click="handleNavigate(item)">
 					标题：{{ item.announcementTitle }}

pages/index/index.vue

@@ -2,7 +2,7 @@
 	<view>
 		<!-- index.wxml -->
 		<view class="topBj">
-			<image :src="loadImgSrc(bigImg)"></image>
+			<image :src="loadImgSrcLocalhost(bigImg)"></image>
 		</view>
 		<view class="container">
 			<!-- 主导航 -->
@@ -86,7 +86,7 @@
 				:circular="circular" class="banner">
 				<block v-for="(item, index) in banners" :key="index">
 					<swiper-item>
-						<image :src="loadImgSrc(item)" mode="aspectFill"></image>
+						<image :src="loadImgSrcLocalhost(item)" mode="aspectFill"></image>
 					</swiper-item>
 				</block>
 			</swiper>
@@ -114,9 +114,7 @@
 					</li>
 					<li>
 						<view class="gxs" @tap="goCooperative"><em class="iconfont icon-gongxiaoshelogo"></em></view>
-						<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>
@@ -308,7 +306,7 @@
 							}
 						],
 						jf: '300',
-						ly: '30',
+            pl: '30',
 						title: '探索乡村能源供给新模式 绘就乡村振兴美丽新画卷'
 					},
 					{
@@ -380,7 +378,7 @@
 			// 跳转至更多高频服务页面
 			toMore(){
 				uni.navigateTo({
-					url:"../service/service"
+					url:"/pages/highServer/service/service"
 				})
 			},
 			goZcDetail(e) {
@@ -445,7 +443,7 @@
 			},
 			goWenBa() {
 				uni.navigateTo({
-					url: '/pages/asking/asking'
+					url: '/pages/demo/wenba/wenba'
 				});
 			},
 			goHangQing() {
@@ -455,13 +453,13 @@
 			},
 			goShangCheng() {
 				uni.navigateTo({
-					url: '/pages/shangcheng/shangcheng'
+					url: '/pages/demo/shangcheng/shangcheng'
 				});
 			},
 
 			goDetails() {
 				uni.navigateTo({
-					url: '/pages/wenbaxiangqing/wenbaxiangqing'
+					url: '/pages/demo/wenbaxiangqing/wenbaxiangqing'
 				});
 			},
 
@@ -572,7 +570,7 @@
 					} else {
 						this.getList()
 						uni.navigateTo({
-							url: '/pages/knowledgeDetails/knowledgeDetails?id=' + item.id,
+							url: '/pages/highServer/knowledgeDetails/knowledgeDetails?id=' + item.id,
 						});
 					}
 				});

pages/matters/matters.vue

@@ -22,7 +22,7 @@
 	        <view class="list" @tap="goDetails(item)" v-for="(item, index1) in qbwd" :key="index1">
 	            <span class="listTitle">{{ item.title }}</span>
 	            <view class="onePic">
-	                <image :src="loadImgSrc(item.picture)">
+	                <image :src="loadImgSrcLocalhost(item.picture)">
 					</image>
 	            </view>
 			</view>

pages/me/me.vue

@@ -6,7 +6,7 @@
 				@headImg="uploadHeadImg"
 				@click="updateImg"
 				class="uni-header-image"
-				:src="initInfo.headImg == null || initInfo.headImg == '' ? initImgPath : loadImgSrc(initInfo.headImg)"
+				:src="initInfo.headImg == null || initInfo.headImg == '' ? initImgPath : loadImgSrcLocalhost(initInfo.headImg)"
 			/>
 			<span>{{ initInfo.name == null || initInfo.name == '' ? initInfo.wechatName : initInfo.name }}</span>
 			<text>{{ initInfo.scoreNum }}</text>

pages/me/nameAuthentication/nameAuthentication.vue

@@ -1,144 +1,148 @@
 <template>
-    <uni-section title="实名认证" type="line">
-        <view class="example">
-            <!-- 自定义表单校验 -->
-            <uni-forms ref="customForm" :rules="customRules" :modelValue="form" class="form">
-                <uni-forms-item label="姓名" required name="name">
-                    <uni-easyinput v-model="form.name" placeholder="请输入姓名" maxlength="20"/>
-                </uni-forms-item>
-                <uni-forms-item label="电话" required name="phone">
-                    <uni-easyinput v-model="form.phone" placeholder="请输入电话" maxlength="13"/>
-                </uni-forms-item>
-                <uni-forms-item label="身份证号" required name="idCard">
-                    <uni-easyinput v-model="form.idCard" placeholder="请输入身份证号" maxlength="18"/>
-                </uni-forms-item>
-				<uni-forms-item label="身份证正反面" required class="onePic" v-if="form.id != null">
-					<image :src="loadImgSrc(item)" v-for="(item, index1) in imageList" :key="index1">
-					</image>
-				</uni-forms-item>
-                <uni-forms-item label="身份证正反面" required name="path" v-if="form.id == null" label-width="320">
-                    <upload :imgArr="imageList" name="path" v-model="form.path" :fileSize="1" :limit="2"
-							style="position: relative;left: -5%;top: -10%;"
-                            @updateImg="updateImg"></upload>
-                </uni-forms-item>
-            </uni-forms>
-            <button type="primary" @click="submitForm('customForm')" v-if="form.id==null">提交</button>
-        </view>
-    </uni-section>
+  <uni-section title="实名认证" type="line">
+    <view class="example">
+      <!-- 自定义表单校验 -->
+      <uni-forms ref="customForm" :rules="customRules" :modelValue="form" class="form">
+        <uni-forms-item label="姓名" required name="name">
+          <uni-easyinput v-model="form.name" placeholder="请输入姓名" maxlength="20"/>
+        </uni-forms-item>
+        <uni-forms-item label="电话" required name="phone">
+          <uni-easyinput v-model="form.phone" placeholder="请输入电话" maxlength="13"/>
+        </uni-forms-item>
+        <uni-forms-item label="身份证号" required name="idCard">
+          <uni-easyinput v-model="form.idCard" placeholder="请输入身份证号" maxlength="18"/>
+        </uni-forms-item>
+        <uni-forms-item label="身份证正反面" required class="onePic" v-if="form.id != null">
+          <image :src="loadImgSrcLocalhost(item)" v-for="(item, index1) in imageList" :key="index1">
+          </image>
+        </uni-forms-item>
+        <uni-forms-item label="身份证正反面" required name="path" v-if="form.id == null" label-width="320">
+          <upload :imgArr="imageList" name="path" v-model="form.path" :fileSize="1" :limit="2"
+                  style="position: relative;left: -5%;top: -10%;"
+                  @updateImg="updateImg"></upload>
+        </uni-forms-item>
+      </uni-forms>
+      <button type="primary" @click="submitForm('customForm')" v-if="form.id==null">提交</button>
+    </view>
+  </uni-section>
 </template>
 
 <script>
-    import upload from '@/components/upload/index.vue'
-    import {appletAdd,getUserInfo} from '@/api/me/nameAuthentication.js'
+import upload from '@/components/upload/index.vue'
+import {appletAdd, getUserInfo} from '@/api/me/nameAuthentication.js'
 
-    export default {
-        components: {
-            upload
+export default {
+  components: {
+    upload
+  },
+  onReady() {
+    // 设置自定义表单校验规则，必须在节点渲染完毕后执行
+    this.$refs.customForm.setRules(this.customRules)
+    this.userId = getApp().globalData.userId
+    this.getUserInfoByUserId(this.userId)
+  },
+  data() {
+    return {
+      form: {},
+      // 表单校验
+      customRules: {
+        name: {
+          rules: [{
+            required: true,
+            errorMessage: '姓名不能为空'
+          }]
         },
-        onReady() {
-            // 设置自定义表单校验规则，必须在节点渲染完毕后执行
-            this.$refs.customForm.setRules(this.customRules)
-			this.userId = getApp().globalData.userId
-			this.getUserInfoByUserId(this.userId)
+        phone: {
+          rules: [{
+            required: true,
+            errorMessage: '电话不能为空'
+          },
+            {
+              pattern: '^1[3456789]\\d{9}$',
+              errorMessage: '请填写正确的手机号'
+            }]
         },
-        data() {
-            return {
-                form: {},
-                // 表单校验
-                customRules: {
-                    name: {
-                        rules: [{
-                            required: true,
-                            errorMessage: '姓名不能为空'
-                        }]
-                    },
-                    phone: {
-                        rules: [{
-                            required: true,
-                            errorMessage: '电话不能为空'
-                        },
-						{
-						  pattern:'^1[3456789]\\d{9}$',
-						  errorMessage: '请填写正确的手机号'
-						}]
-                    },
-                    idCard: {
-                        rules: [{
-                            required: true,
-                            errorMessage: '身份证号不能为空'
-                        },
-						{
-						  pattern: '/(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)/',
-						  errorMessage: '请填写正确的身份号'
-						}]
-                    },
-                    path: {
-                        rules: [{
-                            required: true,
-                            errorMessage: '身份证正反面不能为空'
-                        }]
-                    },
-                },
-                imageList: []
-            }
+        idCard: {
+          rules: [{
+            required: true,
+            errorMessage: '身份证号不能为空'
+          },
+            {
+              pattern: '/(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)/',
+              errorMessage: '请填写正确的身份号'
+            }]
         },
-        methods: {
-            // 取消按钮
-            cancel() {
-                this.open = false;
-                this.reset();
-            },
-            /** 提交按钮 */
-            submitForm(e) {
-				this.$refs[e].validate().then(res => {
-					if(this.imageList.length!=2){
-						uni.showToast({
-							title: "身份证正反面照片为两张！",
-							icon: "none"
-						})
-					}else{
-						appletAdd(this.form).then(res => {
-							uni.navigateBack();
-						});
-					}
-				})
-            },
+        path: {
+          rules: [{
+            required: true,
+            errorMessage: '身份证正反面不能为空'
+          }]
+        },
+      },
+      imageList: []
+    }
+  },
+  methods: {
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 提交按钮 */
+    submitForm(e) {
+      this.$refs[e].validate().then(res => {
+        if (this.imageList.length != 2) {
+          uni.showToast({
+            title: "身份证正反面照片为两张！",
+            icon: "none"
+          })
+        } else {
+          appletAdd(this.form).then(res => {
+            uni.navigateBack();
+          });
+        }
+      })
+    },
 
-			//图片上传
-            updateImg(imgList) {
-                this.imageList = imgList;
-                this.form.path = this.imageList.join(',');
-            },
-			
-			//按userId查询实名认证信息
-			getUserInfoByUserId(userId){
-				getUserInfo(userId).then(res =>{
-					if(res.data!=null){
-						this.form = res.data;
-						this.imageList = res.data.path.split(",")
-					}
-					
-				})
-			}
+    //图片上传
+    updateImg(imgList) {
+      this.imageList = imgList;
+      this.form.path = this.imageList.join(',');
+    },
+
+    //按userId查询实名认证信息
+    getUserInfoByUserId(userId) {
+      getUserInfo(userId).then(res => {
+        if (res.data != null) {
+          this.form = res.data;
+          this.imageList = res.data.path.split(",")
         }
-    };
+
+      })
+    }
+  }
+};
 </script>
 
 <style scoped>
-	.form{
-		width: 100%;
-		padding-left: 3%;
-	}
-	::v-deep .item--uni-forms-item__label{
-		width: 19% !important;
-	}
-	::v-deep .uni-section-content{
-		padding: 0 2%;
-	}
-	::v-deep .uni-forms .uni-forms-item__label:nth-child(4){
-		width: 26% !important;
-	}
-	/* ::v-deep .easyinput--uni-easyinput{
-		margin-left: 10%;
-	} */
-</style>
+.form {
+  width: 100%;
+  padding-left: 3%;
+}
+
+::v-deep .item--uni-forms-item__label {
+  width: 19% !important;
+}
+
+::v-deep .uni-section-content {
+  padding: 0 2%;
+}
+
+::v-deep .uni-forms .uni-forms-item__label:nth-child(4) {
+  width: 26% !important;
+}
+
+/* ::v-deep .easyinput--uni-easyinput{
+  margin-left: 10%;
+} */
+</style>

pages/quotations/quotations.vue

@@ -5,7 +5,7 @@
         <uni-grid :column="5" @change="change" :showBorder="false" :square="true">
           <uni-grid-item v-for="item in categories" :index="item.id">
             <view class="grid-item-box">
-              <image class="image" :src="loadImgSrc(item.icon)" mode="aspectFit"></image>
+              <image class="image" :src="loadImgSrcLocalhost(item.icon)" mode="aspectFit"></image>
               <text class="text">{{ item.productName }}</text>
             </view>
           </uni-grid-item>
@@ -53,7 +53,7 @@ export default {
   data() {
     return {
       book: false,
-
+      total:0,
       //是否显示弹出层
       open: false,
       //悬浮按钮右对齐
@@ -116,6 +116,7 @@ export default {
     getList(row) {
       // 这里是获取列表的方法
       listQuotations(this.queryParams).then(response => {
+		  this.total=response.total
         if (this.queryParams.pageNum === 1) {
           this.quotationsList = this.dataFormat(response.rows)
         } else {

pages/quotations/quotationsForm.vue

@@ -1,5 +1,4 @@
 <template>
-  <uni-section title="自定义校验规则" type="line">
     <view class="example">
       <!-- 自定义表单校验 -->
       <uni-forms ref="customForm" :rules="rules" :modelValue="customFormData" label-align="center">
@@ -27,7 +26,6 @@
       </uni-forms>
       <button type="primary" @click="submit('customForm')">提交</button>
     </view>
-  </uni-section>
 </template>
 
 <script>

pages/quotations/quotationsSecond.vue

@@ -5,7 +5,7 @@
         <uni-grid :column="5" @change="change" showBorder="false" square="false">
           <uni-grid-item v-for="item in categories" :index="item.id">
             <view class="grid-item-box">
-              <image class="image" :src="loadImgSrc(item.icon)" mode="aspectFit"></image>
+              <image class="image" :src="loadImgSrcLocalhost(item.icon)" mode="aspectFit"></image>
               <text class="text">{{ item.productName }}</text>
             </view>
           </uni-grid-item>
@@ -163,4 +163,4 @@ export default {
 }
 
 
-</style>
+</style>

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 {

pages/specialService/loveAtVillage/loveAtVillage.css

@@ -1,136 +1,164 @@
 /* pages/wenda/wenda.wxss */
 .wendaFL {
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-    margin: 30rpx 0 0 0;
+	width: 100%;
+	display: flex;
+	justify-content: space-between;
+	margin: 30rpx 0 0 0;
 }
+
 .wendaFL li {
-    width: 48%;
-    height: 168rpx;
-    position: relative;
+	width: 48%;
+	height: 168rpx;
+	position: relative;
 }
+
 .lbBj {
-    position: absolute;
-    left: 0;
-    top: 0;
-    z-index: 0;
-    width: 100%;
-    height: 100%;
-}
+	position: absolute;
+	left: 0;
+	top: 0;
+	z-index: 0;
+	width: 100%;
+	height: 100%;
+}
+
 .wendaFL li h2 {
-    font-size: 36rpx;
-    position: absolute;
-    left: 30rpx;
-    top: 40rpx;
-    z-index: 1;
-    font-weight: bold;
-}
+	font-size: 36rpx;
+	position: absolute;
+	left: 30rpx;
+	top: 40rpx;
+	z-index: 1;
+	font-weight: bold;
+}
+
 .wendaFL li span {
-    font-size: 30rpx;
-    position: absolute;
-    left: 30rpx;
-    top: 88rpx;
-    z-index: 1;
+	font-size: 30rpx;
+	position: absolute;
+	left: 30rpx;
+	top: 88rpx;
+	z-index: 1;
 }
+
 .wendaFL li.sanNong {
-    color: #0d9970;
+	color: #0d9970;
 }
+
 .wendaFL li.jiuYe {
-    color: #1e8fb4;
+	color: #1e8fb4;
 }
+
 .wendaFL li.faLv {
-    color: #1e5dab;
+	color: #1e5dab;
 }
+
 .wendaFL li.jiuZhen {
-    color: #4a700d;
+	color: #4a700d;
 }
+
 /* 列表 */
 .rnwdList {
-    width: 100%;
-    height: 100%;
+	width: 100%;
+	height: 100%;
 }
+
 .list {
-    border-bottom: solid 2rpx #f6f6f6;
-    padding: 10rpx 0;
-    width: 100%;
+	border-bottom: solid 2rpx #f6f6f6;
+	padding: 20rpx 0;
+	width: 100%;
+	
 }
+
 .lb {
-    background: #0d9970;
-    color: #fff;
-    font-size: 24rpx;
-    width: 12%;
-    text-align: center;
-    padding: 2rpx 0;
-    line-height: 40rpx;
-    height: 40rpx;
-    border-radius: 10rpx;
-}
+	background: #0d9970;
+	color: #fff;
+	font-size: 24rpx;
+	width: 12%;
+	text-align: center;
+	padding: 2rpx 0;
+	line-height: 40rpx;
+	height: 40rpx;
+	border-radius: 10rpx;
+}
+
 .listTitle {
-    font-size: 32rpx;
-    color: #333;
-    line-height: 40rpx;
+	font-size: 32rpx;
+	color: #333;
+	line-height: 40rpx;
 }
+
 .icon-jifen {
-    font-size: 28rpx;
-    color: #07c160;
-    margin: 0 0 0 6rpx;
+	font-size: 28rpx;
+	color: #07c160;
+	margin: 0 0 0 6rpx;
 }
+
 .icon-pinglun,
 .icon-chakan,
 .icon-shoucang {
-    font-size: 28rpx;
-    margin: 0 6rpx 0 20rpx;
-    color: #c4c4c4;
+	font-size: 28rpx;
+	margin: 0 6rpx 0 20rpx;
+	color: #c4c4c4;
 }
+
 .icon-xiangyoujiantou {
-    font-size: 30rpx;
-    color: #c4c4c4;
-    line-height: 60rpx;
+	font-size: 30rpx;
+	color: #c4c4c4;
+	line-height: 60rpx;
 }
+
 .onePic {
-    width: 100%;
-    height: 360rpx;
-    border-radius: 20rpx;
-    overflow: hidden;
-    margin: 20rpx 0;
+	width: 100%;
+	height: 360rpx;
+	border-radius: 20rpx;
+	overflow: hidden;
+	margin: 20rpx 0;
 }
+
 .onePic image {
-    width: 100%;
-    height: 100%;
+	width: 100%;
+	height: 100%;
 }
+
 .twoPic {
-    width: 100%;
-    height: 220rpx;
-    margin: 20rpx 0;
-    display: flex;
-    justify-content: space-between;
+	width: 100%;
+	height: 220rpx;
+	margin: 20rpx 0;
+	display: flex;
+	justify-content: space-between;
 }
+
 .twoPic image {
-    width: 49%;
-    height: auto;
-    border-radius: 20rpx;
+	width: 49%;
+	height: auto;
+	border-radius: 20rpx;
 }
+
 .threePic {
-    width: 100%;
-    height: 160rpx;
-    margin: 20rpx 0;
-    display: flex;
-    justify-content: space-between;
+	width: 100%;
+	height: 160rpx;
+	margin: 20rpx 0;
+	display: flex;
+	justify-content: space-between;
 }
+
 .threePic image {
-    width: 32%;
-    height: auto;
-    border-radius: 20rpx;
+	width: 32%;
+	height: auto;
+	border-radius: 20rpx;
 }
+
 .jlSj {
-    height: 40rpx;
-    display: flex;
-    justify-content: space-between;
-    font-size: 24rpx;
-    margin: 20rpx 0 0 0;
+	height: 40rpx;
+	display: flex;
+	justify-content: space-between;
+	font-size: 24rpx;
+	margin: 20rpx 0 0 0;
 }
+
 .ck {
-    color: #c4c4c4;
-    margin-left:240px;
+	color: #c4c4c4;
 }
+
+.f-r {
+	position: absolute;
+	right: 30rpx;
+}

pages/specialService/loveAtVillage/loveAtVillage.vue

@@ -23,7 +23,7 @@
                 </view>
 
                 <view class="jlSj">
-                    <view class="ck">
+                    <view class="ck f-r">
 						<span>
 							<em class="iconfont icon-chakan"></em>
 							{{ item.likeNum }}

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;
+}