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

manager/src/config/index.js

@@ -21,6 +21,10 @@ export default {
     buyer: "https://buyer-api.pickmall.cn",
     seller: "https://store-api.pickmall.cn",
     manager: "https://admin-api.pickmall.cn"
+    // common: 'http://192.168.0.109:8890',
+    // buyer: 'http://192.168.0.109:8888',
+    // seller: 'http://192.168.0.109:8889',
+    // manager: 'http://192.168.0.109:8887'
   },
   api_prod: {
     common: "https://common-api.pickmall.cn",

manager/src/views/goods/goods-info/goods.vue

@@ -112,7 +112,7 @@
       </Form>
       <div slot="footer">
         <Button type="text" @click="modalVisible = false">取消</Button>
-        <Button type="primary" :loading="submitLoading" @click="lower(form.id)"
+        <Button type="primary" :loading="submitLoading" @click="lower"
           >提交</Button
         >
       </div>
@@ -363,7 +363,7 @@ export default {
       this.modalTitle = "下架操作";
       this.modalVisible = true;
     },
-    lower(id) {
+    lower() {
       lowGoods(this.id, this.underForm).then((res) => {
         this.$Modal.remove();
         if (res.success) {

manager/src/views/home/home.vue

@@ -150,7 +150,7 @@
             <div class="today-item">
               <div>今日交易额</div>
 
-              <span>￥{{homeData.todayOrderPrice | unitPrice }}</span>
+              <span>￥{{homeData.todayOrderPrice ? (homeData.todayOrderPrice  | unitPrice) : 0}}</span>
             </div>
             <div class="today-item">
               <div>今日新增店铺</div>

manager/src/views/member/list/index.vue

@@ -324,7 +324,7 @@ export default {
     // 已选择用户数据
     selectedList: {
       type: null,
-      default: "",
+      default: [],
     },
   },
   watch: {
@@ -344,6 +344,7 @@ export default {
     callback(val, index) {
       this.$set(val, "___selected", !val.___selected);
       console.log(val.___selected);
+      console.log(this.selectMember);
       let findUser = this.selectMember.find((item) => {
         return item.id == val.id;
       });

manager/src/views/my-components/verify/index.vue

@@ -18,7 +18,7 @@
 import { getVerifyImg, postVerifyImg } from './verify.js';
 export default {
   props: {
-    verifyType: {
+    verifyType: { // 验证方式，登录，注册等
       defalut: 'LOGIN',
       type: String
     }
@@ -97,9 +97,6 @@ export default {
       });
     }
   },
-  created () {
-    // this.getImg();
-  },
   watch: {
     verifyType: {
       immediate: true,

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

@@ -98,8 +98,8 @@
 
           </p>
           <p class="item">
-            <span class="label">店铺经纬度：</span>
-            <span class="info">{{storeInfo.storeCenter?storeInfo.storeCenter:'暂未完善'}}</span>
+            <span class="label">店铺定位：</span>
+            <span class="info">{{storeInfo.storeCenter?'已定位':'未定位'}}</span>
           </p>
           <p class="item">
             <span class="label">经营范围：</span>

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

@@ -27,8 +27,18 @@
                 </RadioGroup>
               </FormItem>
 
-              <FormItem label="店铺经纬度" prop="shopCenter">
-                <Input v-model="shopForm.storeCenter" @on-focus="$refs.liliMap.showMap = true" clearable style="width: 350px" />
+              <FormItem label="店铺定位" prop="shopCenter">
+                <!-- <Input v-model="shopForm.storeCenter" @on-focus="$refs.liliMap.showMap = true" clearable style="width: 350px" /> -->
+                <Button
+                  type="info"
+                  v-if="!shopForm.storeCenter"
+                  @click="$refs.liliMap.showMap = true"
+                >点击获取店铺定位</Button>
+                <Button
+                  type="success"
+                  v-else
+                  @click="$refs.liliMap.showMap = true"
+                >已定位</Button>
               </FormItem>
 
               <FormItem label="店铺所在地" prop="storeAddressPath">
@@ -267,7 +277,7 @@ export default {
           { required: true, message: "店铺简介不能为空", trigger: "blur" },
         ],
         storeCenter: [
-          { required: true, message: "店铺经纬度不能为空", trigger: "change" },
+          { required: true, message: "店铺未定位", trigger: "change" },
         ],
         companyName: [
           { required: true, message: "公司名称不能为空", trigger: "blur" },