合并master

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/lili-floor-renovation/wap/alertAdvertising.vue

@@ -80,7 +80,6 @@
 export default {
   data() {
     return {
-      btnWay, // 按钮类型
       type: "full", // 展示方式
       //全屏广告
       advertising: [

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

@@ -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/member/list/memberDetail.vue

@@ -137,7 +137,7 @@
               <Form-item label="订单类型" prop="orderType">
                 <Select v-model="orderSearchForm.orderType" placeholder="请选择" clearable style="width: 200px">
                   <Option value="NORMAL">普通订单</Option>
-                  <Option value="FICTITIOUS">虚拟订单</Option>
+                  <Option value="VIRTUAL">虚拟订单</Option>
                   <Option value="GIFT">赠品订单</Option>
                   <Option value="PINTUAN">拼团订单</Option>
                 </Select>
@@ -479,7 +479,7 @@
             render: (h, params) => {
               if (params.row.orderType == "NORMAL") {
                 return h('div', [h('span', {}, '普通订单'),]);
-              } else if (params.row.orderType == "FICTITIOUS") {
+              } else if (params.row.orderType == "VIRTUAL") {
                 return h('div', [h('span', {}, '虚拟订单'),]);
               } else if (params.row.orderType == "GIFT") {
                 return h('div', [h('span', {}, '赠品订单'),]);

manager/src/views/order/order/fictitiousOrderList.vue

@@ -27,13 +27,9 @@
                 <Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 200px">
                   <Option value="NEW">新订单</Option>
                   <Option value="CONFIRM">已确认</Option>
-                  <Option value="STOCK_LOCK">库存锁定</Option>
-                  <Option value="ERROR">出库失败</Option>
-                  <Option value="WAIT_PINTUAN">待成团</Option>
-                  <Option value="PAID">待发货</Option>
-                  <Option value="DELIVERED">已发货</Option>
-                  <Option value="COMPLETE">已完成</Option>
                   <Option value="TAKE">待核验</Option>
+                  <Option value="COMPLETE">已完成</Option>
+                  <Option value="WAIT_PINTUAN">待成团</Option>
                   <Option value="CANCELLED">已取消</Option>
                 </Select>
               </Form-item>
@@ -98,7 +94,7 @@
           order: "", // 默认排序方式
           startDate: "", // 起始时间
           endDate: "", // 终止时间
-          orderType: "FICTITIOUS",
+          orderType: "VIRTUAL",
           orderSn: "",
           buyerName: "",
           orderStatus: ""
@@ -123,6 +119,19 @@
             title: "订单来源",
             key: "clientType",
             width: 95,
+            render: (h, params) => {
+              if (params.row.clientType == "H5") {
+                return h("div", {}, "移动端");
+              } else if (params.row.clientType == "PC") {
+                return h("div", {}, "PC端");
+              } else if (params.row.clientType == "WECHAT_MP") {
+                return h("div", {}, "小程序端");
+              } else if (params.row.clientType == "APP") {
+                return h("div", {}, "移动应用端");
+              } else {
+                return h("div", {}, params.row.clientType);
+              }
+            },
           },
           {
             title: "买家名称",

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

@@ -171,7 +171,7 @@
                 <div class="div-zoom">
                   <a @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
                 </div>
-                <span v-for="(item, key) in JSON.parse(row.specs)">
+                <span v-for="(item, key) in JSON.parse(row.specs)" :key="key">
                   <span v-show="key!='images'" style="font-size: 12px;color: #999999;">
                     {{key}} : {{item}}
                   </span>
@@ -245,9 +245,8 @@
         </Form>
       </div>
       <div slot="footer" style="text-align: right">
-        <Button type="success" size="large" @click="modifyPriceSubmit"
-          >调整</Button
-        >
+        <Button @click="modal = false">关闭</Button>
+        <Button type="primary" @click="modifyPriceSubmit">调整</Button>
       </div>
     </Modal>
     <!-- 订单取消模态框 -->
@@ -275,9 +274,8 @@
         </Form>
       </div>
       <div slot="footer" style="text-align: right">
-        <Button type="success" size="large" @click="orderCancelSubmit"
-          >取消</Button
-        >
+        <Button @click="orderCancelModal = false">关闭</Button>
+        <Button type="primary" @click="orderCancelSubmit">确认</Button>
       </div>
     </Modal>
     <!--收件地址弹出框-->
@@ -340,8 +338,8 @@
         </Form>
       </div>
       <div slot="footer" style="text-align: right">
-        <Button type="success" size="large" @click="editAddressSubmit">修改</Button
-        >
+        <Button @click="addressModal = false">关闭</Button>
+        <Button type="primary" @click="editAddressSubmit">修改</Button>
       </div>
     </Modal>
     <!-- 订单日志 -->

manager/src/views/personal-center/personal-center.vue

@@ -25,7 +25,7 @@
                 </FormItem>
 
                 <FormItem label="用户名：">
-                  {{ userForm.memberName }}
+                  {{ userForm.username }}
                 </FormItem>
                 <FormItem label="昵称：" prop="nickName">
                   <Input v-model="userForm.nickName" style="width: 250px"/>
@@ -50,25 +50,6 @@
                   <a @click="changePassword">修改</a>
                 </div>
               </div>
-              <!-- #TODO 这块目前好像没有这个功能 -->
-              <!-- <div class="item">
-                <div>
-                  <div class="title">绑定手机</div>
-                  <div class="desc">
-                    <span v-if="userForm.mobile">已绑定手机：{{ userForm.mobile }}</span>
-                    <span v-else>未绑定手机号</span>
-                  </div>
-                </div>
-              </div>
-              <div class="item">
-                <div>
-                  <div class="title">绑定邮箱</div>
-                  <div class="desc">
-                    <span v-if="userForm.email">已绑定邮箱：{{ userForm.email }}</span>
-                    <span v-else>未绑定邮箱</span>
-                  </div>
-                </div>
-              </div> -->
             </div>
           </div>
         </div>
@@ -101,6 +82,7 @@ export default {
         avatar: "",
         nickname: ""
       },
+      saveLoading:false,//loading 状态
       currMenu: "基本信息" // 当前菜单
     };
   },

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

@@ -169,14 +169,16 @@
           <p class="item">
             <span class="label">结算周期：</span>
             <span class="info" v-if="storeInfo.settlementCycle">
+              <template v-for="item in storeInfo.settlementCycle.split(',')">
                <Tag
-                 v-for="item in storeInfo.settlementCycle.split(',')"
-                 :key="item"
-                 v-if="item!==''"
-                 :name="item"
-                 style="marrgin-left: 10px"
-               >{{ item }}
-              </Tag>
+                  :key="item"
+                  v-if="item!==''"
+                  :name="item"
+                  style="marrgin-left: 10px"
+                >{{ item }}
+                </Tag>
+              </template>
+               
             </span>
           </p>
         </div>
@@ -217,7 +219,7 @@
               <Form-item label="订单类型" prop="orderType">
                 <Select v-model="orderSearchForm.orderType" placeholder="请选择" clearable style="width: 200px">
                   <Option value="NORMAL">普通订单</Option>
-                  <Option value="FICTITIOUS">虚拟订单</Option>
+                  <Option value="VIRTUAL">虚拟订单</Option>
                   <Option value="GIFT">赠品订单</Option>
                   <Option value="PINTUAN">拼团订单</Option>
                 </Select>
@@ -577,7 +579,7 @@
             render: (h, params) => {
               if (params.row.orderType == "NORMAL") {
                 return h('div', [h('span', {}, '普通订单'),]);
-              } else if (params.row.orderType == "FICTITIOUS") {
+              } else if (params.row.orderType == "VIRTUAL") {
                 return h('div', [h('span', {}, '虚拟订单'),]);
               } else if (params.row.orderType == "GIFT") {
                 return h('div', [h('span', {}, '赠品订单'),]);