Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

template/admin/src/api/order.js

@@ -26,10 +26,11 @@ export function orderList(data) {
  * @description 发票头部统计
  * @param {Object} param data {Object} 传值参数
  */
-export function orderInvoiceChart() {
+export function orderInvoiceChart(data) {
   return request({
     url: 'order/invoice/chart',
     method: 'get',
+    params: data,
   });
 }
 

template/admin/src/pages/kefu/pc/components/rightMenu.vue

@@ -147,7 +147,7 @@
                   <Button
                     class="btn"
                     type="primary"
-                    v-if="item._status._type == 1 && item._status._type != 0"
+                    v-if="item._status._type == 1 && item._status._type != 0 && item.shipping_type != 2"
                     @click.stop="openDelivery(item)"
                     >发货</Button
                   >

template/admin/src/pages/marketing/storeBargain/create.vue

@@ -295,7 +295,7 @@
                 </FormItem>
               </Col>
             </Row>
-            <div v-show="current === 2">
+            <div v-if="current === 2">
               <FormItem label="内容：">
                 <WangEditor
                   style="width: 90%"
@@ -304,7 +304,7 @@
                 ></WangEditor>
               </FormItem>
             </div>
-            <div v-show="current === 3">
+            <div v-if="current === 3">
               <FormItem label="规则：">
                 <WangEditor
                   style="width: 90%"
@@ -789,6 +789,8 @@ export default {
           this.formValidate = info;
           this.formValidate.rule = info.rule === null ? '' : info.rule;
           this.$set(this.formValidate, 'items', info.attrs.items);
+          this.description = this.formValidate.description;
+
           this.columns = info.attrs.header;
           let radio = {
             title: '选择',
@@ -885,6 +887,9 @@ export default {
               }
             }
             this.current += 1;
+            setTimeout((e) => {
+              this.formValidate.description += ' ';
+            }, 0);
           } else {
             return this.$Message.warning('请完善您的信息');
           }
@@ -892,6 +897,11 @@ export default {
       } else {
         if (this.formValidate.image) {
           this.current += 1;
+          if (this.current == 3) {
+            setTimeout((e) => {
+              this.formValidate.rule += ' ';
+            }, 0);
+          }
         } else {
           this.$Message.warning('请选择商品');
         }

template/admin/src/pages/order/invoice/index.vue

@@ -68,7 +68,7 @@
           </Row>
         </Form>
       </div>
-    </card>
+    </Card>
     <Card :bordered="false" dis-hover>
       <Tabs v-model="currentTab" @on-click="onClickTab" v-if="tablists" class="mb20">
         <TabPane :label="'全部发票（' + tablists.all + '）'" name=" " />
@@ -535,7 +535,7 @@ export default {
       this.getList();
     },
     getTabs() {
-      orderInvoiceChart()
+      orderInvoiceChart(this.orderData)
         .then((res) => {
           this.tablists = res.data;
         })
@@ -546,6 +546,7 @@ export default {
     // 精确搜索()
     orderSearch() {
       this.orderData.page = 1;
+      this.getTabs();
       this.getList();
     },
     // 具体日期搜索()；

template/uni-app/pages.json

@@ -395,7 +395,7 @@
 				{
 					"path": "user_invoice_order/index",
 					"style": {
-						"navigationBarTitleText": "订单详情",
+						"navigationBarTitleText": "发票详情",
 						"app-plus": {
 							// #ifdef APP-PLUS
 							"titleNView": {