Merge branch 'ma'

manager/src/views/lili-floor-renovation/wap/alertAdvertising.vue

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

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 @click="modal = false">关闭</Button>
-          >调整</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 @click="orderCancelModal = false">关闭</Button>
-          >取消</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/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>
+              </template>
+               
             </span>
           </p>
         </div>

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

@@ -3,8 +3,7 @@
     <Card style="height: 60px">
       <div style="">
         <Button v-if="allowOperation.editPrice" @click="modifyPrice" type="primary">调整价格</Button>
-        <Button v-if="allowOperation.editConsignee" @click="editAddress" type="primary">修改收货地址
+        <Button v-if="allowOperation.editConsignee" @click="editAddress" type="primary">修改收货地址</Button>
-        </Button>
         <Button v-if="allowOperation.showLogistics" @click="logistics" type="primary">查看物流</Button>
         <Button @click="orderLog" type="primary">订单日志</Button>
         <Button v-if="allowOperation.take" @click="orderTake" type="primary">订单核销</Button>
@@ -181,7 +180,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>
     <!--收件地址弹出框-->
@@ -210,7 +210,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>
     <!-- 订单核销 -->
@@ -227,7 +228,8 @@
         </Form>
       </div>
       <div slot="footer" style="text-align: right">
-        <Button type="success" size="large" @click="orderTakeSubmit">核销</Button>
+        <Button @click="orderTakeModal = false">关闭</Button>
+        <Button type="primary" @click="orderTakeSubmit">核销</Button>
       </div>
     </Modal>
     <!-- 订单日志 -->
@@ -303,8 +305,8 @@
       </div>
 
       <div slot="footer" style="text-align: right">
-        <Button size="large" @click="orderDeliverHandelCancel">取消</Button>
+        <Button  @click="orderDeliverModal = false">关闭</Button>
-        <Button type="success" size="large" @click="orderDeliverySubmit">发货</Button>
+        <Button type="primary" @click="orderDeliverySubmit">发货</Button>
       </div>
     </Modal>
   </div>
@@ -600,10 +602,6 @@ export default {
         }
       });
     },
-    //订单日志取消
-    orderDeliverHandelCancel() {
-      this.orderDeliverModal = false;
-    },
     //订单发货提交
     orderDeliverySubmit() {
       this.$refs.orderDeliveryForm.validate((valid) => {