2 vuotta sitten · ab70a5066b
--- a/dist/index.html
+++ b/dist/index.html
@@ -7,4 +7,8 @@
 
				         hm.src = "https://hm.baidu.com/hm.js?8b02a318fde5831da10426656a43d03c";
			
 
				         var s = document.getElementsByTagName("script")[0];
			
 
				         s.parentNode.insertBefore(hm, s);
			
 
				-      })();</script><script src=./static/ks3jssdk/plupload.full.min.js></script><script src=./static/ks3jssdk/ks3jssdk.min.js></script><link href=./static/css/app.1783749f583d7fcf13ee15ed3370ad6c.css rel=stylesheet></head><body><script src=https://unpkg.com/tinymce@4.7.5/tinymce.min.js></script><div id=app></div><script type=text/javascript src=./static/js/manifest.a1e4263309742ef1d6ef.js></script><script type=text/javascript src=./static/js/vendor.dc1ac6978ca1430d79f6.js></script><script type=text/javascript src=./static/js/app.c64b2d71eda4ac34b590.js></script></body></html>
			
 
				+<<<<<<< HEAD
			
 
				+      })();</script><script src=./static/ks3jssdk/plupload.full.min.js></script><script src=./static/ks3jssdk/ks3jssdk.min.js></script><link href=./static/css/app.1783749f583d7fcf13ee15ed3370ad6c.css rel=stylesheet></head><body><script src=https://unpkg.com/tinymce@4.7.5/tinymce.min.js></script><div id=app></div><script type=text/javascript src=./static/js/manifest.a1e4263309742ef1d6ef.js></script><script type=text/javascript src=./static/js/vendor.dc1ac6978ca1430d79f6.js></script><script type=text/javascript src=./static/js/app.c64b2d71eda4ac34b590.js></script></body></html>
			
 
				+=======
			
 
				+      })();</script><script src=./static/ks3jssdk/plupload.full.min.js></script><script src=./static/ks3jssdk/ks3jssdk.min.js></script><link href=./static/css/app.9d4c966d970ae2eac94282b5ddad9149.css rel=stylesheet></head><body><script src=https://unpkg.com/tinymce@4.7.5/tinymce.min.js></script><div id=app></div><script type=text/javascript src=./static/js/manifest.d85f59c595e66af4a618.js></script><script type=text/javascript src=./static/js/vendor.dc1ac6978ca1430d79f6.js></script><script type=text/javascript src=./static/js/app.dde52268e2c25c572cdb.js></script></body></html>
			
 
				+>>>>>>> main
			
--- a/dist/static/css/app.9d4c966d970ae2eac94282b5ddad9149.css
+++ b/dist/static/css/app.9d4c966d970ae2eac94282b5ddad9149.css
--- a/dist/static/css/app.9d4c966d970ae2eac94282b5ddad9149.css.map
+++ b/dist/static/css/app.9d4c966d970ae2eac94282b5ddad9149.css.map
--- a/dist/static/js/10.95811e13a2d3b3a0e181.js
+++ b/dist/static/js/10.95811e13a2d3b3a0e181.js
--- a/dist/static/js/10.95811e13a2d3b3a0e181.js.map
+++ b/dist/static/js/10.95811e13a2d3b3a0e181.js.map
--- a/dist/static/js/10.cb2a3e966579a732185b.js
+++ b/dist/static/js/10.cb2a3e966579a732185b.js
--- a/dist/static/js/10.cb2a3e966579a732185b.js.map
+++ b/dist/static/js/10.cb2a3e966579a732185b.js.map
--- a/dist/static/js/3.c76566372aac46f89afc.js
+++ b/dist/static/js/3.c76566372aac46f89afc.js
--- a/dist/static/js/3.c76566372aac46f89afc.js.map
+++ b/dist/static/js/3.c76566372aac46f89afc.js.map
--- a/dist/static/js/4.0670f4c35eaef104a502.js.map
+++ b/dist/static/js/4.0670f4c35eaef104a502.js.map
--- a/dist/static/js/4.8d291fda6bcd8d035efe.js
+++ b/dist/static/js/4.8d291fda6bcd8d035efe.js
--- a/dist/static/js/4.8d291fda6bcd8d035efe.js.map
+++ b/dist/static/js/4.8d291fda6bcd8d035efe.js.map
--- a/dist/static/js/41.5968e654b19db4c75fd6.js
+++ b/dist/static/js/41.5968e654b19db4c75fd6.js
--- a/dist/static/js/41.5968e654b19db4c75fd6.js.map
+++ b/dist/static/js/41.5968e654b19db4c75fd6.js.map
--- a/dist/static/js/42.9b8d50819b9fe60fa0c0.js
+++ b/dist/static/js/42.9b8d50819b9fe60fa0c0.js
--- a/dist/static/js/42.9b8d50819b9fe60fa0c0.js.map
+++ b/dist/static/js/42.9b8d50819b9fe60fa0c0.js.map
--- a/dist/static/js/42.a07e04b5105c5050e909.js
+++ b/dist/static/js/42.a07e04b5105c5050e909.js
--- a/dist/static/js/42.a07e04b5105c5050e909.js.map
+++ b/dist/static/js/42.a07e04b5105c5050e909.js.map
--- a/dist/static/js/43.b42570492034f1970c77.js
+++ b/dist/static/js/43.b42570492034f1970c77.js
--- a/dist/static/js/43.b42570492034f1970c77.js.map
+++ b/dist/static/js/43.b42570492034f1970c77.js.map
--- a/dist/static/js/43.f3a8773f8e6cb59bdc78.js
+++ b/dist/static/js/43.f3a8773f8e6cb59bdc78.js
--- a/dist/static/js/43.f3a8773f8e6cb59bdc78.js.map
+++ b/dist/static/js/43.f3a8773f8e6cb59bdc78.js.map
--- a/dist/static/js/7.7241a747a1169637b347.js
+++ b/dist/static/js/7.7241a747a1169637b347.js
--- a/dist/static/js/7.7241a747a1169637b347.js.map
+++ b/dist/static/js/7.7241a747a1169637b347.js.map
--- a/dist/static/js/7.7c039b1ebbb18ac96264.js
+++ b/dist/static/js/7.7c039b1ebbb18ac96264.js
--- a/dist/static/js/7.7c039b1ebbb18ac96264.js.map
+++ b/dist/static/js/7.7c039b1ebbb18ac96264.js.map
--- a/dist/static/js/8.a5579369bc5cf15abbdf.js
+++ b/dist/static/js/8.a5579369bc5cf15abbdf.js
--- a/dist/static/js/8.a5579369bc5cf15abbdf.js.map
+++ b/dist/static/js/8.a5579369bc5cf15abbdf.js.map
--- a/dist/static/js/9.fb66fa235c948e0d4216.js
+++ b/dist/static/js/9.fb66fa235c948e0d4216.js
--- a/dist/static/js/9.fb66fa235c948e0d4216.js.map
+++ b/dist/static/js/9.fb66fa235c948e0d4216.js.map
--- a/dist/static/js/app.c64b2d71eda4ac34b590.js
+++ b/dist/static/js/app.c64b2d71eda4ac34b590.js
--- a/dist/static/js/app.c64b2d71eda4ac34b590.js.map
+++ b/dist/static/js/app.c64b2d71eda4ac34b590.js.map
--- a/dist/static/js/app.dde52268e2c25c572cdb.js
+++ b/dist/static/js/app.dde52268e2c25c572cdb.js
--- a/dist/static/js/app.dde52268e2c25c572cdb.js.map
+++ b/dist/static/js/app.dde52268e2c25c572cdb.js.map
--- a/dist/static/js/manifest.a1e4263309742ef1d6ef.js
+++ b/dist/static/js/manifest.a1e4263309742ef1d6ef.js
--- a/dist/static/js/manifest.a1e4263309742ef1d6ef.js.map
+++ b/dist/static/js/manifest.a1e4263309742ef1d6ef.js.map
--- a/dist/static/js/manifest.d85f59c595e66af4a618.js
+++ b/dist/static/js/manifest.d85f59c595e66af4a618.js
--- a/dist/static/js/manifest.d85f59c595e66af4a618.js.map
+++ b/dist/static/js/manifest.d85f59c595e66af4a618.js.map
--- a/src/views/oms/order/index.vue
+++ b/src/views/oms/order/index.vue
@@ -173,12 +173,12 @@
 
				               @click="handleViewOrder(scope.$index, scope.row)"
			
 
				               >查看订单</el-button
			
 
				             >
			
 
				-            <el-button
			
 
				+            <!-- <el-button
			
 
				               size="mini"
			
 
				               @click="handleCloseOrder(scope.$index, scope.row)"
			
 
				               v-show="scope.row.status === 0 || scope.row.status === 6"
			
 
				               >关闭订单</el-button
			
 
				-            >
			
 
				+            > -->
			
 
				             <el-button
			
 
				               size="mini"
			
 
				               @click="handleDeliveryOrder(scope.$index, scope.row)"
			
@@ -380,7 +380,9 @@ export default {
 
				         return "支付宝";
			
 
				       } else if (value === 2) {
			
 
				         return "微信";
			
 
				-      } else {
			
 
				+      } else if (value === 3) {
			
 
				+        return "余额";
			
 
				+      }else {
			
 
				         return "未支付";
			
 
				       }
			
 
				     },
			
--- a/src/views/oms/order/orderDetail.vue
+++ b/src/views/oms/order/orderDetail.vue
@@ -40,13 +40,13 @@
 
				             >修改收货人信息</el-button
			
 
				           >
			
 
				           <el-button size="mini">修改商品信息</el-button>
			
 
				-          <el-button size="mini" @click="showUpdateMoneyDialog"
			
 
				+          <!-- <el-button size="mini" @click="showUpdateMoneyDialog"
			
 
				             >修改费用信息</el-button
			
 
				-          >
			
 
				+          > -->
			
 
				           <!-- <el-button size="mini" @click="showMessageDialog">发送站内信</el-button> -->
			
 
				-          <el-button size="mini" @click="showCloseOrderDialog"
			
 
				+          <!-- <el-button size="mini" @click="showCloseOrderDialog"
			
 
				             >关闭订单</el-button
			
 
				-          >
			
 
				+          > -->
			
 
				           <el-button size="mini" @click="showMarkOrderDialog"
			
 
				             >备注订单</el-button
			
 
				           >
			
@@ -231,7 +231,7 @@
 
				           <el-col :span="6" class="table-cell-title">商品合计</el-col>
			
 
				           <el-col :span="6" class="table-cell-title">运费</el-col>
			
 
				           <el-col :span="6" class="table-cell-title">优惠券</el-col>
			
 
				-          <el-col :span="6" class="table-cell-title">积分抵扣</el-col>
			
 
				+          <el-col :span="6" class="table-cell-title">余额</el-col>
			
 
				         </el-row>
			
 
				         <el-row>
			
 
				           <el-col :span="6" class="table-cell"
			
@@ -249,16 +249,16 @@
 
				         </el-row>
			
 
				         <el-row>
			
 
				           <el-col :span="6" class="table-cell-title">活动优惠</el-col>
			
 
				-          <el-col :span="6" class="table-cell-title">折扣金额</el-col>
			
 
				-          <el-col :span="6" class="table-cell-title">订单总金额</el-col>
			
 
				           <el-col :span="6" class="table-cell-title">应付款金额</el-col>
			
 
				+          <el-col :span="6" class="table-cell-title">订单总金额</el-col>
			
 
				+          <el-col :span="6" class="table-cell-title">现金金额</el-col>
			
 
				         </el-row>
			
 
				         <el-row>
			
 
				           <el-col :span="6" class="table-cell"
			
 
				             >-￥{{ order.promotionAmount }}</el-col
			
 
				           >
			
 
				           <el-col :span="6" class="table-cell"
			
 
				-            >-￥{{ order.discountAmount }}</el-col
			
 
				+            >-￥{{  order.payAmount+ order.integrationAmount }}</el-col
			
 
				           >
			
 
				           <el-col :span="6" class="table-cell">
			
 
				             <span class="color-danger"
			
@@ -268,7 +268,7 @@
 
				           <el-col :span="6" class="table-cell">
			
 
				             <span class="color-danger"
			
 
				               >￥{{
			
 
				-                order.payAmount + order.freightAmount - order.discountAmount
			
 
				+                order.payAmount
			
 
				               }}</span
			
 
				             >
			
 
				           </el-col>
			
@@ -373,7 +373,7 @@
 
				           <el-col :span="6" class="table-cell-title">商品合计</el-col>
			
 
				           <el-col :span="6" class="table-cell-title">运费</el-col>
			
 
				           <el-col :span="6" class="table-cell-title">优惠券</el-col>
			
 
				-          <el-col :span="6" class="table-cell-title">积分抵扣</el-col>
			
 
				+          <el-col :span="6" class="table-cell-title">余额</el-col>
			
 
				         </el-row>
			
 
				         <el-row>
			
 
				           <el-col :span="6" class="table-cell"
			
@@ -393,9 +393,9 @@
 
				         </el-row>
			
 
				         <el-row>
			
 
				           <el-col :span="6" class="table-cell-title">活动优惠</el-col>
			
 
				-          <el-col :span="6" class="table-cell-title">折扣金额</el-col>
			
 
				-          <el-col :span="6" class="table-cell-title">订单总金额</el-col>
			
 
				           <el-col :span="6" class="table-cell-title">应付款金额</el-col>
			
 
				+          <el-col :span="6" class="table-cell-title">订单总金额</el-col>
			
 
				+          <el-col :span="6" class="table-cell-title">现金金额</el-col>
			
 
				         </el-row>
			
 
				         <el-row>
			
 
				           <el-col :span="6" class="table-cell"
			
@@ -561,7 +561,9 @@ export default {
 
				         return "支付宝";
			
 
				       } else if (value === 2) {
			
 
				         return "微信";
			
 
				-      } else {
			
 
				+      } else if (value === 3) {
			
 
				+        return "余额";
			
 
				+      }else {
			
 
				         return "未支付";
			
 
				       }
			
 
				     },
			
@@ -706,6 +708,7 @@ export default {
 
				       });
			
 
				     },
			
 
				     showUpdateMoneyDialog() {
			
 
				+      return
			
 
				       this.moneyDialogVisible = true;
			
 
				       this.moneyInfo.orderId = this.order.id;
			
 
				       this.moneyInfo.freightAmount = this.order.freightAmount;
			
--- a/src/views/pms/product/index.vue
+++ b/src/views/pms/product/index.vue
@@ -353,6 +353,7 @@ const defaultListQuery = {
 
				   productSn: null,
			
 
				   productCategoryId: null,
			
 
				   brandId: null,
			
 
				+  stock:null
			
 
				 };
			
 
				 export default {
			
 
				   name: "productList",