Merge branch 'master-v' into dev

dist/_nuxt/000eae2f2bbd78eb5d56.css

@@ -0,0 +1 @@
+.i-title[data-v-009d64f6]{margin:0 0 10px 10px;font-size:20px;font-weight:600}.table[data-v-009d64f6]{height:calc(100% - 80px)}.text-title[data-v-009d64f6]{font-weight:600}.header-bar>div[data-v-009d64f6]{margin-bottom:5px}.green[data-v-009d64f6]{color:#259b24}.orange[data-v-009d64f6]{color:#ff9800}.red[data-v-009d64f6]{color:#ff021e}

dist/_nuxt/033f35dddefc793a52d8.css

@@ -1 +0,0 @@
-.i-title[data-v-6decb932]{margin:0 0 10px 10px;font-size:20px;font-weight:600}.table[data-v-6decb932]{height:calc(100% - 80px)}.text-title[data-v-6decb932]{font-weight:600}.header-bar>div[data-v-6decb932]{margin-bottom:5px}.green[data-v-6decb932]{color:#259b24}.orange[data-v-6decb932]{color:#ff9800}.red[data-v-6decb932]{color:#ff021e}

dist/_nuxt/6a1edba1619cd32fe234.css

@@ -0,0 +1 @@
+.user-info[data-v-374f143a],.user-name[data-v-374f143a]{margin-bottom:10px}.order-footer[data-v-374f143a]{margin-top:20px}.product_title[data-v-374f143a]{overflow:hidden;-webkit-line-clamp:1;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical}#mainBody[data-v-374f143a]{white-space:nowrap;overflow-x:scroll;height:calc(100% - 40px)}.orange[data-v-374f143a]{color:#ff9800}.red[data-v-374f143a]{color:#ff021e}.green[data-v-374f143a]{color:#259b24}

dist/_nuxt/99044354f4cabbf5959d.css

@@ -0,0 +1 @@
+.i-title[data-v-3a9dffc4]{margin:0 0 10px 10px;font-size:20px;font-weight:600}.table[data-v-3a9dffc4]{height:calc(100% - 80px)}.text-title[data-v-3a9dffc4]{font-weight:600}.header-bar>div[data-v-3a9dffc4]{margin-bottom:5px}.green[data-v-3a9dffc4]{color:#259b24}.orange[data-v-3a9dffc4]{color:#ff9800}.red[data-v-3a9dffc4]{color:#ff021e}

dist/_nuxt/c3d9c12d23dfa5fc374a.css

@@ -1 +0,0 @@
-.i-title[data-v-11be5dd7]{margin:0 0 10px 10px;font-size:20px;font-weight:600}.table[data-v-11be5dd7]{height:calc(100% - 80px)}.text-title[data-v-11be5dd7]{font-weight:600}.header-bar>div[data-v-11be5dd7]{margin-bottom:5px}.green[data-v-11be5dd7]{color:#259b24}.orange[data-v-11be5dd7]{color:#ff9800}.red[data-v-11be5dd7]{color:#ff021e}

dist/_nuxt/f215163a6046ebf8818d.css

@@ -1 +0,0 @@
-.user-info[data-v-e2856c40],.user-name[data-v-e2856c40]{margin-bottom:10px}.order-footer[data-v-e2856c40]{margin-top:20px}.product_title[data-v-e2856c40]{overflow:hidden;-webkit-line-clamp:1;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical}#mainBody[data-v-e2856c40]{white-space:nowrap;overflow-x:scroll;height:calc(100% - 40px)}.orange[data-v-e2856c40]{color:#ff9800}.red[data-v-e2856c40]{color:#ff021e}.green[data-v-e2856c40]{color:#259b24}

pages/main/index/cash_form.vue

@@ -121,7 +121,7 @@
                 <!--结薪-->
                 <template v-else-if="scope.row.order_type == 5">
                   <!--如果不是余额购买-->
-                  <span v-if="scope.row.channel != 'balance' && scope.row.channel != 'qingtuanbao'" class="green">
+                  <span v-if="scope.row.channel != 'balance' && scope.row.channel != 'qingtuanbao'" >
                   {{ (scope.row.real_amount / 100).toFixed(2) }}
                 </span>
                   <span v-else>
@@ -147,7 +147,7 @@
                 <!--结薪-->
                 <template v-else-if="scope.row.order_type == 5">
                   <!--如果不是余额购买-->
-                  <span v-if="scope.row.channel != 'balance' && scope.row.channel != 'qingtuanbao'" class="green">
+                  <span v-if="scope.row.channel != 'balance' && scope.row.channel != 'qingtuanbao'" >
                   {{ (scope.row.real_amount / 100).toFixed(2) }}
                 </span>
                   <span v-else>

pages/main/index/orders.vue

@@ -265,7 +265,7 @@
               <!--结薪-->
               <template  v-else-if="scope.row.order_type == 5">
                 <!--如果不是余额购买-->
-                <span v-if="scope.row.channel != 'balance' && scope.row.channel != 'qingtuanbao'" class="green">
+                <span v-if="scope.row.channel != 'balance' && scope.row.channel != 'qingtuanbao'">
                   {{(scope.row.real_amount/100).toFixed(2)}}
                 </span>
                 <span v-else>
@@ -291,7 +291,7 @@
               <!--结薪-->
               <template  v-else-if="scope.row.order_type == 5">
                 <!--如果不是余额购买-->
-                <span v-if="scope.row.channel != 'balance' && scope.row.channel != 'qingtuanbao'" class="green">
+                <span v-if="scope.row.channel != 'balance' && scope.row.channel != 'qingtuanbao'">
                   {{(scope.row.real_amount/100).toFixed(2)}}
                 </span>
                 <span v-else>

pages/main/index/project_form.vue

@@ -203,7 +203,7 @@
                 <!--结薪-->
                 <template v-else-if="scope.row.order_type == 5">
                   <!--如果不是余额购买-->
-                  <span v-if="scope.row.channel != 'balance' && scope.row.channel != 'qingtuanbao'" class="green">
+                  <span v-if="scope.row.channel != 'balance' && scope.row.channel != 'qingtuanbao'" >
                   {{ (scope.row.real_amount / 100).toFixed(2) }}
                 </span>
                   <span v-else>
@@ -229,7 +229,7 @@
                 <!--结薪-->
                 <template v-else-if="scope.row.order_type == 5">
                   <!--如果不是余额购买-->
-                  <span v-if="scope.row.channel != 'balance' && scope.row.channel != 'qingtuanbao'" class="green">
+                  <span v-if="scope.row.channel != 'balance' && scope.row.channel != 'qingtuanbao'" >
                   {{ (scope.row.real_amount / 100).toFixed(2) }}
                 </span>
                   <span v-else>

pages/main/index/user_bills.vue

@@ -112,7 +112,7 @@
                 <!--结薪-->
                 <template  v-else-if="scope.row.order_type == 5">
                   <!--如果不是余额购买-->
-                  <span v-if="scope.row.channel != 'balance' && scope.row.channel != 'qingtuanbao'" class="green">
+                  <span v-if="scope.row.channel != 'balance' && scope.row.channel != 'qingtuanbao'" >
                   {{(scope.row.real_amount).toFixed(2)}}
                 </span>
                   <span v-else>
@@ -138,7 +138,7 @@
                 <!--结薪-->
                 <template  v-else-if="scope.row.order_type == 5">
                   <!--如果不是余额购买-->
-                  <span v-if="scope.row.channel != 'balance' && scope.row.channel != 'qingtuanbao'" class="green">
+                  <span v-if="scope.row.channel != 'balance' && scope.row.channel != 'qingtuanbao'" >
                   {{(scope.row.real_amount).toFixed(2)}}
                 </span>
                   <span v-else>