ソースを参照

Merge remote-tracking branch 'origin/master'

刘浩男 1 年間 前
コミット
c6f992eb3e

+ 9 - 9
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": {

+ 0 - 5
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:[

+ 2 - 3
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>

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

@@ -128,6 +128,7 @@
 		line-height: 0;
 	}
 	.wenzhangCont {
+		width: 100%;
 		font-size: 34rpx;
 		margin: 30rpx 0;
 	}
@@ -232,13 +233,17 @@
 		width: 15vw;
 		height: 9vh;
 		border-radius: 50%;
-		background-color: #007AFF;
 		position: absolute;
+		background-color: #F1F1F1;
 		right: 3%;
 		bottom: 3%;
 		font-size: 218%;
 		text-indent: -16%;
 		line-height: 190%;
+		border: none;
+	}
+	.likeBtn::after{
+		border: none;
 	}
 </style>
 

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

@@ -4,7 +4,7 @@
         <view class="rnwdList" v-for="(item, index) in list" :key="index">
             <view @tap="goDetails(item.id)" class="cooperativeImgBox">
                 <!--<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">

+ 1 - 1
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">

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

+ 8 - 7
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,6 +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>
@@ -380,7 +381,7 @@
 			// 跳转至更多高频服务页面
 			toMore(){
 				uni.navigateTo({
-					url:"../service/service"
+					url:"/pages/highServer/service/service"
 				})
 			},
 			goZcDetail(e) {
@@ -445,7 +446,7 @@
 			},
 			goWenBa() {
 				uni.navigateTo({
-					url: '/pages/asking/asking'
+					url: '/pages/demo/wenba/wenba'
 				});
 			},
 			goHangQing() {
@@ -455,13 +456,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 +573,7 @@
 					} else {
 						this.getList()
 						uni.navigateTo({
-							url: '/pages/knowledgeDetails/knowledgeDetails?id=' + item.id,
+							url: '/pages/highServer/knowledgeDetails/knowledgeDetails?id=' + item.id,
 						});
 					}
 				});

+ 1 - 1
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>

+ 1 - 1
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>

+ 135 - 131
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>

+ 1 - 1
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>

+ 2 - 2
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>