Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui

buyer/src/components/goodsDetail/ShowGoodsDetail.vue

@@ -390,7 +390,8 @@ export default {
       margin-right: 5px;
       width: 50px;
       height: 50px;
-      img{width: 100%;}
+      overflow: hidden;
+      img{width: 100%;height: 100%;}
     }
   }
   .preview-img{

buyer/src/pages/home/orderCenter/ApplyAfterSale.vue

@@ -129,7 +129,7 @@ export default {
           { required: true, message: '请输入银行卡号' },
           {
             type: 'string',
-            pattern: /^([1-9]{1})(\d{14}|\d{18})$/,
+            pattern: /^[0-9]\d*$/,
             message: '请输入正确的银行卡号'
           }
         ],

buyer/src/pages/shopEntry/FirstApply.vue

@@ -9,17 +9,17 @@
           placeholder="请填写公司信息"
         />
       </FormItem>
-      <FormItem prop="storeAddressIdPath" label="公司所在地">
+      <FormItem prop="companyAddressIdPath" label="公司所在地">
         <region
           style="width: 250px"
           @selected="selectedRegion"
           :addressId="address"
         />
       </FormItem>
-      <FormItem prop="storeAddressDetail" label="公司详细地址">
+      <FormItem prop="companyAddress" label="公司详细地址">
         <Input
           type="text"
-          v-model="form.storeAddressDetail"
+          v-model="form.companyAddress"
           placeholder="请填写公司详细信息"
         />
       </FormItem>
@@ -31,7 +31,7 @@
           ><span slot="append">人</span>
           </Input>
       </FormItem>
-      <FormItem prop="linkPhone" label="公司电话">
+      <FormItem prop="companyPhone" label="公司电话">
         <Input
           type="text"
           v-model="form.companyPhone"
@@ -217,8 +217,8 @@ export default {
       },
       rules: { // 验证规则
         companyName: [{ required: true, message: '请填写公司信息' }],
-        storeAddressIdPath: [{ required: true, message: '请选择公司所在地' }],
+        companyAddressIdPath: [{ required: true, message: '请选择公司所在地' }],
-        storeAddressDetail: [{ required: true, message: '请填写公司详细地址' }],
+        companyAddress: [{ required: true, message: '请填写公司详细地址' }],
         employeeNum: [
           { required: true, message: '请填写公司员工总数' },
           { pattern: RegExp.integer, message: '只能填写正整数' }
@@ -229,9 +229,13 @@ export default {
         ],
         linkName: [{ required: true, message: '请填写联系人姓名' }],
         linkPhone: [
-          { required: true, message: '请填写公司电话' },
+          { required: true, message: '请填写联系人电话' },
           { pattern: RegExp.mobile, message: '请填写正确的号码' }
         ],
+        companyPhone: [
+          { required: true, message: '请填写公司电话' },
+          { pattern: RegExp.TEL, message: '请填写正确的号码' }
+        ],
         companyEmail: [
           { required: true, message: '请填写电子邮箱' },
           { type: 'email', message: '请输入正确的邮箱' }
@@ -277,10 +281,10 @@ export default {
     },
     // 地址选择回显
     selectedRegion (item) {
-      this.$set(this.form, 'storeAddressIdPath', item[0].toString());
+      this.$set(this.form, 'companyAddressIdPath', item[0].toString());
       this.$set(
         this.form,
-        'storeAddressPath',
+        'companyAddressPath',
         item[1].toString().replace(/\s/g, '')
       );
     },
@@ -352,7 +356,7 @@ export default {
       if (this.form.licencePhoto) {
         this.form.legalPhoto = this.content.legalPhoto.split(',');
         this.form.licencePhoto = this.content.licencePhoto.split(',');
-        this.address = this.form.storeAddressIdPath;
+        this.address = this.form.companyAddressIdPath;
       }
     }
   }

buyer/src/pages/shopEntry/ShopEntry.vue

@@ -77,12 +77,13 @@ export default {
             this.dataReview = false;
             let data = res.result;
             let first = [
-              'storeAddressIdPath',
+              'companyAddressPath',
-              'storeAddressPath',
+              'companyAddress',
-              'storeAddressDetail',
+              'companyAddressIdPath',
               'companyEmail',
               'companyName',
               'employeeNum',
+              'companyPhone',
               'legalId',
               'legalName',
               'licencePhoto',
@@ -104,7 +105,10 @@ export default {
               'storeCenter',
               'storeDesc',
               'storeLogo',
-              'storeName'
+              'storeName',
+              'storeAddressIdPath',
+              'storeAddressPath',
+              'storeAddressDetail'
             ];
 
             this.storeDisable = data.storeDisable;

buyer/src/pages/shopEntry/ThirdApply.vue

@@ -72,6 +72,20 @@
           @click="$refs.liliMap.showMap = true"
         >已定位</Button>
       </FormItem>
+      <FormItem prop="storeAddressIdPath" label="店铺所在地">
+        <region
+          style="width: 250px"
+          @selected="selectedRegion"
+          :addressId="address"
+        />
+      </FormItem>
+      <FormItem prop="storeAddressDetail" label="店铺详细地址">
+        <Input
+          type="text"
+          v-model="form.storeAddressDetail"
+          placeholder="请填写店铺详细地址"
+        />
+      </FormItem>
       <FormItem prop="storeDesc" label="店铺简介">
         <Input
           type="textarea"
@@ -102,6 +116,7 @@ import { getCategory } from '@/api/goods';
 import Map from '@/components/map/index';
 import storage from '@/plugins/storage';
 import { commonUrl } from '@/plugins/request.js';
+import region from '@/components/map/region.vue';
 export default {
   props: {
     content: {
@@ -109,7 +124,7 @@ export default {
       type: Object
     }
   },
-  components: { liliMap: Map },
+  components: { liliMap: Map, region },
   data () {
     return {
       loading: false, // 加载状态
@@ -117,6 +132,7 @@ export default {
       action: commonUrl + '/common/upload/file', // 上传地址
       accessToken: {}, // 验证token
       previewPicture: '', // 预览图片
+      address: '', // 回显地址
       visible: false, // 图片预览
       form: { // 表单数据
         storeLogo: []
@@ -128,7 +144,9 @@ export default {
         storeName: [{ required: true, message: '请填写店铺名称' }],
         storeLogo: [{ required: true, message: '请上传店铺logo' }],
         storeDesc: [{ required: true, message: '请填写店铺简介' }],
-        storeCenter: [{ required: true, message: '请选择店铺位置' }]
+        storeCenter: [{ required: true, message: '请选择店铺位置' }],
+        storeAddressIdPath: [{ required: true, message: '请选择店铺位置' }],
+        storeAddressDetail: [{ required: true, message: '请输入店铺详细地址' }]
       },
       categoryList: [] // 分类数据
     };
@@ -211,6 +229,15 @@ export default {
       getCategory(0).then((res) => {
         if (res.success) this.categoryList = res.result;
       });
+    },
+    // 地址选择回显
+    selectedRegion (item) {
+      this.$set(this.form, 'storeAddressIdPath', item[0].toString());
+      this.$set(
+        this.form,
+        'storeAddressPath',
+        item[1].toString().replace(/\s/g, '')
+      );
     }
   },
   mounted () {
@@ -226,6 +253,7 @@ export default {
       } else {
         this.form.storeLogo = [];
       }
+      this.address = this.form.storeAddressIdPath;
       this.$forceUpdate();
     }
   }

manager/src/views/order/order/orderDetail.vue

@@ -170,6 +170,10 @@
               <span class="label">运费：</span>
               <span class="txt">{{ orderInfo.order.freightPrice | unitPrice('￥')}}</span>
             </li>
+            <li v-if="orderInfo.order.priceDetailDTO.updatePrice">
+              <span class="label">修改金额：</span>
+              <span class="txt theme_color">¥{{ orderInfo.order.priceDetailDTO.updatePrice | unitPrice }}</span>
+            </li>
             <li v-if="orderInfo.order.priceDetailDTO.payPoint != 0">
               <span class="label">使用积分：</span>
               <span class="txt flowPrice">{{orderInfo.order.priceDetailDTO.payPoint}}</span>

manager/src/views/seller/shop/shopList.vue

@@ -29,10 +29,10 @@
             <Option value="REFUSED">审核拒绝</Option>
           </Select>
         </Form-item>
-        <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
         <Form-item label="创建时间" prop="createTime">
           <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
         </Form-item>
+        <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
       </Form>
       <Row class="operation padding-row">
         <Button @click="add" type="primary">添加</Button>

seller/src/styles/common.scss

@@ -1,4 +1,3 @@
-$theme_color: #804ed1;
 
 
 //自动移滚动条样式

seller/src/views/order/order/orderDetail.vue

@@ -233,6 +233,10 @@
               orderInfo.order.freightPrice | unitPrice("￥")
             }}</span>
           </li>
+          <li v-if="orderInfo.order.priceDetailDTO.updatePrice">
+              <span class="label">修改金额：</span>
+              <span class="txt theme_color">¥{{ orderInfo.order.priceDetailDTO.updatePrice | unitPrice }}</span>
+            </li>
           <li v-if="orderInfo.order.priceDetailDTO.payPoint != 0">
             <span class="label">使用积分：</span>
             <span class="txt">{{
@@ -987,4 +991,7 @@ dl dt {
     }
   }
 }
+.theme_color{
+  color: $theme_color;
+}
 </style>