Browse Source

修改字段以及样式

liuxiaona 2 years ago
parent
commit
d736accaa5

+ 2 - 0
.idea/workspace.xml

@@ -3,6 +3,8 @@
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="326b77ef-a0bc-4d8a-bd1c-34c4541ee400" name="Changes" comment="">
5 5
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/project/src/components/detials/customerStatus.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/detials/customerStatus.vue" afterDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/project/src/components/detials/orderCharge.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/detials/orderCharge.vue" afterDir="false" />
6 8
       <change beforePath="$PROJECT_DIR$/project/src/components/orderManage/charge.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/orderManage/charge.vue" afterDir="false" />
7 9
     </list>
8 10
     <option name="SHOW_DIALOG" value="false" />

+ 1 - 1
project/src/components/detials/customerStatus.vue

@@ -3,7 +3,7 @@
3 3
     <template v-if="list&&list.length>0">
4 4
       <div v-for="(l,idx) in list" :key="idx">
5 5
         <div class="dayDate">{{l.create_time&&l.create_time.split(' ')[0]}}{{l.week}}</div>
6
-        <div class="subBox" v-for="(s,sIdx) in l.sub" :key="sIdx" :class="idx==0 ? 'tMar17' : ''">
6
+        <div class="subBox" v-for="(s,sIdx) in l.sub" :key="sIdx" :class="sIdx==0 ? 'tMar17' : ''">
7 7
           <div class="subBox_line">
8 8
 <!--            <i class="el-icon-price-tag f16"></i>-->
9 9
             <img src="../../assets/img/lable_detial.png" alt="" style="display: inline-block;width: 16px">

+ 3 - 3
project/src/components/detials/orderCharge.vue

@@ -10,8 +10,8 @@
10 10
           </div>
11 11
         </template>
12 12
         <template v-slot="{ row,$index }">
13
-          <span v-if="item.prop == 'id'">
14
-              {{row[item.prop]||row[item.prop]==0?row[item.prop]:'-'}}
13
+          <span v-if="item.prop == 'order_id'">
14
+              {{row[item.prop]?row[item.prop]:'-'}}
15 15
             </span>
16 16
           <span v-else-if="item.prop == 'pay_status'">
17 17
               {{row[item.prop]?(row[item.prop]==1?'已付款':'未付款'):'-'}}
@@ -39,7 +39,7 @@ export default {
39 39
     return{
40 40
       loading:false,
41 41
       desCol: [
42
-        { prop: "id", label: "订单ID", min_width: 160, fixed: 'left' },
42
+        { prop: "order_id", label: "订单ID", min_width: 180, fixed: 'left' },
43 43
         { prop: "wx_account", label: "公众号", },
44 44
         { prop: "name", label: "用户昵称", min_width: 160 },
45 45
         { prop: "mp_user_register_time", label: "用户注册时间", min_width: 160 },

+ 3 - 3
project/src/components/orderManage/charge.vue

@@ -5,7 +5,7 @@
5 5
         <date-picker title="" :quickFlag="true" :afferent_time="default_time" :clearFlag='false' :reset="resetFlag" @changeTime="changeTime"></date-picker>
6 6
         <self-channel style="margin-left: 10px;" title="" type='chargePay' :reset="resetFlag" :labelWidth="true" @channelDefine="(val)=>{chargePay_val = val;init_predata();init(1)}"></self-channel>
7 7
         <self-channel style="margin-left: 10px;" title="" type='paySource' :reset="resetFlag" :labelWidth="true" @channelDefine="(val)=>{paySource_val = val;init_predata();init(1)}"></self-channel>
8
-        <self-input style="margin-left: 10px;" width="220px" :hasLabel="false" :reset="resetFlag" label_name="订单ID或用户昵称" @inputChange='(val)=>{id_val = val;init(1)}'></self-input>
8
+        <self-input style="margin-left: 10px;" width="220px" :hasLabel="false" :reset="resetFlag" label_name="订单ID" @inputChange='(val)=>{id_val = val;init(1)}'></self-input>
9 9
       </div>
10 10
       <div class="reset" @click="resetEvent">重置</div>
11 11
     </div>
@@ -76,7 +76,7 @@
76 76
             <span v-else-if="item.prop == 'name'">
77 77
               {{row[item.prop]?row[item.prop]:'-'}}
78 78
             </span>
79
-            <span v-else-if="item.prop == 'id'">
79
+            <span v-else-if="item.prop == 'order_id'">
80 80
               {{row[item.prop]||row[item.prop]==0?row[item.prop]:'-'}}
81 81
             </span>
82 82
             <span v-else-if="item.prop == 'pay_status'">
@@ -130,7 +130,7 @@ export default {
130 130
       drama_id: '',
131 131
       gl_loading: false,
132 132
       desCol: [
133
-        { prop: "id", label: "订单ID", min_width: 160, fixed: 'left' },
133
+        { prop: "order_id", label: "订单ID", min_width: 180, fixed: 'left' },
134 134
         { prop: "wx_account", label: "公众号", },
135 135
         { prop: "name", label: "用户昵称", min_width: 160 },
136 136
         { prop: "mp_user_register_time", label: "用户注册时间", min_width: 160 },