bug修改

common/service/config.service.js

@@ -4,7 +4,7 @@ let BASE_URL = ''
 if (process.env.NODE_ENV == 'development') {
 	// BASE_URL = 'https://test.baoxianzhanggui.com/locallive-java' // 测试环境
 	// BASE_URL = 'http://192.168.0.36:8080/jeecg-boot' // 开发环境
-    BASE_URL = 'http://192.168.0.42:8080/jeecg-boot' // 开发环境
+    BASE_URL = 'http://192.168.0.52:8080/jeecg-boot' // 开发环境
 
 } else {
 	BASE_URL = 'https://test.baoxianzhanggui.com/locallive-java' // 测试环境

pages/login/map.vue

@@ -119,14 +119,19 @@
 				}
 				this.selectIndex = index;
 				var location = add.location.split(",");
-				console.log(location);
 				this.selectAddr = {
 					address:add.pname?(add.pname+add.cityname+add.adname+add.address):(add.district+add.address),
 					latitude:location[1],
 					longitude:location[0]
 				};
-				this.markers[0].latitude = +location[1];
-				this.markers[0].longitude = +location[0];
+				this.markers = [{
+					latitude:location[1],
+					longitude: location[0]
+				}]
+				// this.markers[0].latitude = +location[1];
+				// this.markers[0].longitude = +location[0];
+				console.log(this.markers[0]);
+
 			},
 			// 根据内容进行检索
 			searchFn(){

pages/login/resetpassword.vue

@@ -147,6 +147,7 @@ export default {
                 this.$tip.toast('请输入正确的手机号');
                 return false
             }
+          
             this.$http.get("/merchant/app/sendMsg", { params: { phone: this.phoneNo } }).then(res => {
                 if (res.data.success) {
                     this.smsCountDown = 60;
@@ -180,10 +181,19 @@ export default {
                 this.$tip.toast('请填短信验证码');
                 return;
             }
+            if (!this.password) {
+                this.$tip.toast('请输入新密码');
+                return false
+            }
+            if (!this.password1) {
+                this.$tip.toast('请再次输入新密码');
+                return false
+            }
             if (this.password !== this.password1) {
                 this.$tip.toast('请确定密码是否一致');
                 return;
             }
+
             let loginParams = {
                 phone: this.phoneNo,
                 passWord: this.password,

pages/login/settled.vue

@@ -19,29 +19,7 @@
                 <view :class="tab == '3' ? 'color' : ''">门店信息</view>
             </view>
         </view>
-        <view class="progress-status" v-else>
-            <view v-if="form.status == 0">
-                <view class="status">
-                    <image src="/static/login/status1.png" mode="aspectFit"></image>
-                    <text>待审核</text>
-                </view>
-                <view>{{form.updateTime }} 提交的店铺信息待审核中</view>
-            </view>
-            <view v-if="form.status == 1">
-                <view class="status">
-                    <image src="/static/login/status2.png" mode="aspectFit"></image>
-                    <text style="color: #53CC48;">审核通过</text>
-                </view>
-                <view>{{form.updateTime }} 提交的店铺信息审核通过</view>
-            </view>
-            <view v-if="form.status == 2">
-                <view class="status">
-                    <image src="/static/login/status3.png" mode="aspectFit"></image>
-                    <text>审核驳回</text>
-                </view>
-                <view>驳回原因：{{form.remark }} </view>
-            </view>
-        </view>
+        <status  v-else :status="form.status" :updateTime="form.updateTime" :remark="form.remark"></status>
         <view v-if="tab == 1" class="tab-top">
             <form>
                 <!-- <view class="borderRadiu">
@@ -303,10 +281,11 @@ import { watch } from 'vue'
 import configService from '../../common/service/config.service'
 import regionPicker from "../../components/w-picker/region-picker.vue"
 // import aMap from "./map.vue"
+import status from "../store/components/status.vue"
 
 export default {
     components: {
-        regionPicker,
+        regionPicker,status
         // aMap
     },
     data() {
@@ -387,7 +366,9 @@ export default {
                 : []
             this.businessLicenseImg = configService.apiUrl + '/' + obj.businessLicense
             this.identityOneImg = configService.apiUrl + '/' + obj.identityOne
-           this.headPhotoImg=obj.headPhoto? obj.headPhoto.split(',').filter(id => id !== ''):[]
+            this.headPhotoImg=obj.headPhoto? obj.headPhoto.split(',').filter(id => id !== ''):[]
+            obj.headPhoto=obj.headPhoto? obj.headPhoto.split(',').filter(id => id !== ''):[]
+            this.identityTwoImg=configService.apiUrl + '/' + obj.identityTwo
             this.form = obj
 
         }
@@ -607,7 +588,14 @@ export default {
                 })
             }
             else {
-                this.$http.post('/merchant/localMerchantInfo/edit', { ...this.form, source: 2,headPhoto: this.form.headPhoto.join(',') }).then(res => {
+                let data= { 
+                    ...this.form, 
+                    source: 2, 
+                    headPhoto: this.form.headPhoto.join(',') , 
+                    longitude: this.markers.length>0?this.markers[0].longitude:'', 
+                    latitude: this.markers.length>0?this.markers[0].latitude :''
+                }
+                this.$http.post('/merchant/localMerchantInfo/edit',data).then(res => {
                     if (res.data.success) {
                         this.$tip.success(res.data.result || '成功')
                         uni.navigateBack({

pages/store/brandMessage.vue

@@ -3,30 +3,7 @@
         <cu-custom bgColor="bg-fff" :isBack="true">
             <block slot="content"> 品牌信息</block>
         </cu-custom>
-        <view class="progress-status" v-if="form && form.logoStatus !== null" :style="form && form.logoStatus == null ? '' : 'padding: 20upx 42upx;'">
-
-            <view v-if="form.logoStatus == 0">
-                <view class="status">
-                    <image src="/static/login/status1.png" mode="aspectFit"></image>
-                    <text>待审核</text>
-                </view>
-                <view>{{form.logoUpdateTime }} 提交的店铺信息待审核中</view>
-            </view>
-            <view v-if="form.logoStatus == 1">
-                <view class="status">
-                    <image src="/static/login/status2.png" mode="aspectFit"></image>
-                    <text style="color: #53CC48;">审核通过</text>
-                </view>
-                <view>{{form.logoUpdateTime }} 提交的店铺信息审核通过</view>
-            </view>
-            <view v-if="form.logoStatus == 2">
-                <view class="status">
-                    <image src="/static/login/status3.png" mode="aspectFit"></image>
-                    <text style="color: #F34F4F;">审核驳回</text>
-                </view>
-                <view>驳回原因：{{form.logoRemark }} </view>
-            </view>
-        </view>
+        <status v-if="form && form.logoStatus !== null" :status="form.logoStatus" :updateTime="form.logoUpdateTime" :remark="form.logoRemark"></status>
         <view class="tab-top" :style="form && form.logoStatus == null ? 'margin-top: 14upx' : 'margin-top: 144upx;'">
             <form>
                 <view class="borderRadiu">
@@ -35,7 +12,7 @@
                             <text class="text-bold">品牌/logo</text>
                             <i class="text-bg "></i>
                         </view>
-                        <view class="title" style="color: #449AFF;font-size: 26upx;">查看示例</view>
+                        <!-- <view class="title" style="color: #449AFF;font-size: 26upx;">查看示例</view> -->
                     </view>
                     <view class="customize">
                         <view class="booder-top">
@@ -62,6 +39,8 @@
 <script>
 import configService from '../../common/service/config.service'
 import { USER_INFO } from "@/common/util/constants"
+import status from "./components/status.vue"
+
 export default {
     data(){
         return{
@@ -69,6 +48,7 @@ export default {
             form:{}
         }
     },
+    components:{status},
     async onLoad(data) {
         if (data.params) {
             let obj = JSON.parse(decodeURIComponent(data.params));
@@ -155,29 +135,7 @@ page {
     padding: 0 26upx;
 }
 
-.progress-status {
-    position: fixed;
-    width: 100%;
-    z-index: 9999;
-    background: #FFFFFF;
-
-    .status {
-        font-size: 38upx;
-        color: #F6863E;
-        font-weight: 500;
-        margin-bottom: 10upx;
-
-        text {
-            margin-left: 5upx
-        }
 
-        image {
-            vertical-align: text-top;
-            width: 42upx;
-            height: 42upx;
-        }
-    }
-}
 .borderRadiu {
     background-color: #fff;
     .customize{

pages/store/businessInfor.vue

@@ -3,30 +3,7 @@
         <cu-custom bgColor="bg-fff" :isBack="true">
             <block slot="content"> 经营信息</block>
         </cu-custom>
-        <view class="progress-status" v-if="form && form.videoStatus !== null"
-            :style="form && form.videoStatus == null ? '' : 'padding: 20upx 42upx;'">
-            <view v-if="form.videoStatus == 0">
-                <view class="status">
-                    <image src="/static/login/status1.png" mode="aspectFit"></image>
-                    <text>待审核</text>
-                </view>
-                <view>{{ form.videoUpdateTime }} 提交的店铺信息待审核中</view>
-            </view>
-            <view v-if="form.videoStatus == 1">
-                <view class="status">
-                    <image src="/static/login/status2.png" mode="aspectFit"></image>
-                    <text style="color: #53CC48;">审核通过</text>
-                </view>
-                <view>{{ form.videoUpdateTime }} 提交的店铺信息审核通过</view>
-            </view>
-            <view v-if="form.videoStatus == 2">
-                <view class="status">
-                    <image src="/static/login/status3.png" mode="aspectFit"></image>
-                    <text style="color: #F34F4F;">审核驳回</text>
-                </view>
-                <view>驳回原因：{{ form.videoRemark }} </view>
-            </view>
-        </view>
+        <status v-if="form && form.videoStatus !== null" :status="form.videoStatus" :updateTime="form.videoUpdateTime" :remark="form.videoRemark"></status>
         <view class="tab-top" :style="form && form.videoStatus == null ? 'margin-top: 14upx;' : 'margin-top: 144upx;'">
             <view class="borderRadiu">
                 <view class=" cu-form-group margin-top1 justify-between">
@@ -109,7 +86,10 @@
 <script>
 import configService from '../../common/service/config.service'
 import { USER_INFO } from "@/common/util/constants"
+import status from "./components/status.vue"
+
 export default {
+    components:{status},
     data() {
         return {
             video: '',

pages/store/businessQua.vue

@@ -1,33 +1,10 @@
 <template>
     <view>
         <cu-custom bgColor="bg-fff" :isBack="true">
-            <block slot="content"> 品牌信息</block>
+            <block slot="content"> 经营资质</block>
         </cu-custom>
-        <view class="progress-status" v-if="form && form.specialStatus !== null"
-            :style="form && form.specialStatus == null ? '' : 'padding: 20upx 42upx;'">
-
-            <view v-if="form.specialStatus == 0">
-                <view class="status">
-                    <image src="/static/login/status1.png" mode="aspectFit"></image>
-                    <text>待审核</text>
-                </view>
-                <view>{{ form.specialUpdateTime }} 提交的店铺信息待审核中</view>
-            </view>
-            <view v-if="form.specialStatus == 1">
-                <view class="status">
-                    <image src="/static/login/status2.png" mode="aspectFit"></image>
-                    <text style="color: #53CC48;">审核通过</text>
-                </view>
-                <view>{{ form.specialUpdateTime }} 提交的店铺信息审核通过</view>
-            </view>
-            <view v-if="form.specialStatus == 2">
-                <view class="status">
-                    <image src="/static/login/status3.png" mode="aspectFit"></image>
-                    <text style="color: #F34F4F;">审核驳回</text>
-                </view>
-                <view>驳回原因：{{ form.specialRemark }} </view>
-            </view>
-        </view>
+        <status v-if="form && form.specialStatus !== null" :status="form.specialStatus" :updateTime="form.specialUpdateTime" :remark="form.specialRemark"></status>
+       
         <view class="tab-top" :style="form && form.specialStatus == null ? 'margin-top: 14upx' : 'margin-top: 144upx;'">
             <form>
                 <view class="borderRadiu">
@@ -56,6 +33,7 @@
 <script>
 import configService from '../../common/service/config.service'
 import { USER_INFO } from "@/common/util/constants"
+import status from "./components/status.vue"
 export default {
     data() {
         return {
@@ -63,11 +41,12 @@ export default {
             form: {}
         }
     },
+    components:{status},
     async onLoad(data) {
         if (data.params) {
             let obj = JSON.parse(decodeURIComponent(data.params));
             this.form = obj
-            this.specialImg = obj.logo
+            this.specialImg = obj.special
         }
     },
     methods: {
@@ -98,6 +77,7 @@ export default {
                         let data = JSON.parse(files.data);
                         if (data.success) {
                             this.specialImg = configService.apiUrl + '/' + data.message
+                            
                         }
                     }
                 });
@@ -149,29 +129,6 @@ page {
     padding: 0 26upx;
 }
 
-.progress-status {
-    position: fixed;
-    width: 100%;
-    z-index: 9999;
-    background: #FFFFFF;
-
-    .status {
-        font-size: 38upx;
-        color: #F6863E;
-        font-weight: 500;
-        margin-bottom: 10upx;
-
-        text {
-            margin-left: 5upx
-        }
-
-        image {
-            vertical-align: text-top;
-            width: 42upx;
-            height: 42upx;
-        }
-    }
-}
 
 .borderRadiu {
     background-color: #fff;

pages/store/components/status.vue

@@ -0,0 +1,78 @@
+<template>
+    <view class="progress-status" 
+        :style="status == null ? '' : 'padding: 20upx 42upx;'">
+        <view v-if="status == 0">
+            <view class="flex justify-between">
+                <view class="status">
+                    <image src="/static/login/status1.png" mode="aspectFit"></image>
+                    <text style="font-weight: 500;">待审核</text>
+                </view>
+                <text style="color: #999;">{{updateTime }}</text>
+            </view>
+            <view  style="color: #666666;"> 提交的店铺信息待审核中</view>
+        </view>
+        <view v-if="status== 1">
+            <view class="flex justify-between">
+                <view class="status">
+                    <image src="/static/login/status2.png" mode="aspectFit"></image>
+                    <text style="font-weight: 500;color: #509B45;">审核通过</text>
+                </view>
+                <text style="color: #999;">{{updateTime }}</text>
+            </view>
+            <view style="color: #666666;">{{ updateTime }} 提交的店铺信息审核通过</view>
+        </view>
+        <view v-if="status == 2">
+            <view class="flex justify-between">
+                <view class="status">
+                    <image src="/static/login/status3.png" mode="aspectFit"></image>
+                    <text style="color: #F34F4F;font-weight: 500;">审核驳回</text>
+                </view>
+                <text style="color: #999;">{{updateTime }}</text>
+            </view>
+            <view>驳回原因：{{ remark }} </view>
+        </view>
+    </view>
+</template>
+<script>
+export default {
+    props:{
+        status: {
+            type: Number,
+            default: null
+        },
+        updateTime: {
+            type: String,
+            default: ''
+        },
+        remark: {
+            type: String,
+            default: ''
+        }
+}
+}
+</script>
+<style scoped lang="scss">
+.progress-status {
+    position: fixed;
+    width: 100%;
+    z-index: 9999;
+    background: #FFFFFF;
+    border-top: 1px solid #EEEEEE;
+    .status {
+        font-size: 38upx;
+        color: #596ABB;
+        font-weight: 500;
+        margin-bottom: 10upx;
+
+        text {
+            margin-left: 5upx
+        }
+
+        image {
+            vertical-align: text-top;
+            width: 42upx;
+            height: 42upx;
+        }
+    }
+}
+</style>