Merge remote-tracking branch 'origin/master'

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

@@ -704,24 +704,24 @@
             <Form-item label="成本价" prop="costPrice" style="width: 800px">
                 <i-input v-model="tbCfStationItem.costPrice" placeholder="成本价"/>
             </Form-item>
-            <Form-item label="商品图片" prop="itemImg" >
-                <!--   <i-input v-model="xPicture.pictureUrl" placeholder="图片地址"/> -->
-                <upload
-                        multiple
-                        action="../api/osstest/uploadtest"
-                        :before-upload="handleBeforeUpload"
-                        :on-success="vhandleSuccess" :show-upload-list="false" accept="image/jpeg, image/png">
-                    <i-button icon="ios-cloud-upload-outline">请选择图片</i-button>
-                </upload>
-                <div id="imgWrapper" style="display: flex;position: relative;">
-                    <div v-for="item in uploadList" style="margin-left: 5px;" :data-img-path="item">
-                        <img :src="item"  width="100" height="100" id="itemImg">
-                        <i class="ivu-icon ivu-icon-ios-trash-outline"
-                           style="cursor:pointer;display: flex;font-size: 24px;position: relative;left:11px"
-                           @click="delImg1(item)"></i>
-                    </div>
-                </div>
-            </Form-item>
+<!--            <Form-item label="商品图片" prop="itemImg" >-->
+<!--                &lt;!&ndash;   <i-input v-model="xPicture.pictureUrl" placeholder="图片地址"/> &ndash;&gt;-->
+<!--                <upload-->
+<!--                        multiple-->
+<!--                        action="../api/osstest/uploadtest"-->
+<!--                        :before-upload="handleBeforeUpload"-->
+<!--                        :on-success="vhandleSuccess" :show-upload-list="false" accept="image/jpeg, image/png">-->
+<!--                    <i-button icon="ios-cloud-upload-outline">请选择图片</i-button>-->
+<!--                </upload>-->
+<!--                <div id="imgWrapper" style="display: flex;position: relative;">-->
+<!--                    <div v-for="item in uploadList" style="margin-left: 5px;" :data-img-path="item">-->
+<!--                        <img :src="item"  width="100" height="100" id="itemImg">-->
+<!--                        <i class="ivu-icon ivu-icon-ios-trash-outline"-->
+<!--                           style="cursor:pointer;display: flex;font-size: 24px;position: relative;left:11px"-->
+<!--                           @click="delImg1(item)"></i>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </Form-item>-->
             <Form-item label="商品链接" prop="itemUrl" style="width: 800px">
                 <i-input v-model="tbCfStationItem.itemUrl" placeholder="商品链接"/>
             </Form-item>

platform-admin/src/main/webapp/js/common.js

@@ -854,6 +854,21 @@ itemStatusFormatEn = function (cellvalue) {
     }
     return returnStr;
 }
+
+activityStatusFormat = function (cellvalue) {
+    var returnStr;
+    if (cellvalue == '0') {
+        returnStr = "<i-button class=\"ivu-btn ivu-btn-warning\"  style='border-radius:25px;' type=\"info\">活动关闭</i-button>";
+    } else if (cellvalue == '1') {
+        returnStr = "<i-button class=\"ivu-btn ivu-btn-info\"  style='border-radius:25px;' type=\"warning\">活动开启</i-button>";
+    }
+    return returnStr;
+}
+
+
+
+
+
 shows = function (cellvalue, options, rowObject) {
     let returnStr;
     returnStr = "<i-button class=\"ivu-btn ivu-btn-info\"  onclick=showWord('" + rowObject.id + "') type=\"info\">查看</i-button>";

platform-admin/src/main/webapp/statics/css/bootstrap.min.css

@@ -5251,7 +5251,9 @@ a.label:focus, a.label:hover {
 .label-default {
     background-color: #777
 }
-
+.label-defaultNew {
+    background-color: red
+}
 .label-default[href]:focus, .label-default[href]:hover {
     background-color: #5e5e5e
 }