Merge remote-tracking branch 'origin/master'

pages/highServer/cooperative/cooperative.vue

@@ -2,7 +2,7 @@
     <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="loadImgSrcLocalhost(item.imgUrl)" class="cooperativeImg"></image>
             </view>
@@ -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/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,9 @@
 </script>
 <style lang="scss">
 	@import './inquiryDetails.css';
-
+    .container{
+		padding:50rpx;
+	}
 	.collect {
 		.icon-shoucang:before {
 			color: red;

pages/quotations/quotations.vue

@@ -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/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 }}