解决主图问题

platform-admin/src/main/resources/dev/platform.properties

@@ -7,7 +7,8 @@
 #jdbc.password=diaoyun666
 
 
-jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
+#jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
+jdbc.url: jdbc:mysql://159.138.48.71:3306/test?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
 jdbc.username: root
 jdbc.password: AfriShop_date@2#!&*8
 

platform-admin/src/main/resources/prod/platform.properties

@@ -7,7 +7,9 @@
 #jdbc.password=diaoyun666
 
 
-jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
+#jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
+jdbc.url: jdbc:mysql://159.138.48.71:3306/test?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
+
 jdbc.username: root
 jdbc.password: AfriShop_date@2#!&*8
 

platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfstationitem.html

@@ -465,6 +465,15 @@
         }
         .calculator{
             color: #66ccff;
+            border: 1px solid red;
+            border-radius: 12px;
+            padding: 2%;
+            width: 40%;
+            margin-left: 80px;
+        }
+        .calculator .ibox-text{
+            text-align: center;
+            padding-bottom: 4%;
         }
         .calculator .ibox-text>span{
             color: 	#FF3E96;
@@ -472,6 +481,7 @@
         .calculator>.ibox{
             display: flex;
             justify-content: space-between;
+            align-items: center;
             margin-top: 0.5%;
         }
         </style>
@@ -482,6 +492,8 @@
         <Row :gutter="16">
             <div class="first">
                 <div class="querydatas">
+
+
                     <div class="search-group">
                         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                         <span>
@@ -729,7 +741,7 @@
                 </i-select>
             </Form-item>
 
-            <div class="ivu-form-item calculator" style="width: 360px;">
+            <div class="ivu-form-item calculator">
                 <div class="ibox-text">我就是个计算器 <span>o(一︿一+)o</span> </div>
                 <div class="ibox">
                     <div>请输入成本价（人民币）：</div>
@@ -1181,3 +1193,4 @@
     </script>
 </body>
 </html>
+        <img src="../../../statics/img/aaa.jpg"/>
\ No newline at end of file

platform-admin/src/main/webapp/js/sys/tbcfstationitem.js

@@ -778,7 +778,10 @@ let vm = new Vue({
                 alert('请填写运费模板  o(￣ヘ￣o＃)');
                 return
             }
-
+            if (vm.tbCfStationItem.itemPrice<vm.tbCfStationItem.discountPrice && vm.tbCfStationItem.itemPrice != ''){
+                alert('原价不能小于现价  o(￣ヘ￣o＃)');
+                return
+            }
             if (pic == 0){
                 alert('sku价格不能为空或小于等于0  o(￣ヘ￣o＃)');
                 return
@@ -833,8 +836,9 @@ let vm = new Vue({
                 $('#imgWrapper').children().each((item, element) => {
                     _temArr.push($(element).attr('data-img-path'))
                 })
-                vm.uploadList = _temArr;
-                vm.tbCfStationItem.itemImg = vm.uploadList.map(res => res).join(';');
+                var newlist = _temArr
+                // vm.uploadList = _temArr;
+                vm.tbCfStationItem.itemImg = newlist.map(res => res).join(';');
                 vm.tbCfStationItem.itemDesc = encodeURI(UE.getEditor('itemDesc').getContent()); // 富文本取值
                 vm.tbCfStationItem.itemDesc = vm.tbCfStationItem.itemDesc.replace(/&nbsp;/g, " ");
                 vm.tbCfStationItem.skuImgs = vm.AttributeImgArr.map(item => item.img_path).join(';');
@@ -855,6 +859,7 @@ let vm = new Vue({
                     successCallback: function (r) {
                         alert('操作成功', function (index) {
                             vm.reload();
+                            vm.uploadList = []
                         });
                     }
                 });