activity

f110779e · 潘鹏 · 8e8c72ff · f110779e · f110779e
--- a/platform-admin/src/main/webapp/WEB-INF/page/sys/attributes.html
+++ b/platform-admin/src/main/webapp/WEB-INF/page/sys/attributes.html
@@ -3,6 +3,40 @@
 <head>
    <title></title>
    #parse("sys/header.html")
+    <style>
+        .activityEdit{
+            margin-left: -40px;
+            border: 1px solid #e3e3e3;
+            width: 400px;
+            padding: 20px;
+            text-align: center;
+            border-radius:6px ;
+        }
+        .activityEdit ul{
+
+        }
+        .activityEdit ul li{
+            margin-bottom: 10px;
+        }
+        .activityEdit ul li span{
+            display:inline-block;
+            padding:0 15px;
+            border: 1px solid red;
+            border-radius: 6px;
+            color: red;
+            cursor:pointer;
+            margin-left: 5px;
+        }
+        .activityAdd{
+            margin-top: 20px;
+            display:inline-block;
+            border: 1px dashed #e3e3e3;
+            cursor:pointer;
+            padding: 0px 50px;
+            border-radius: 6px;
+
+        }
+    </style>
 </head>
 <body>
 <div id="rrapp" v-cloak style="height: calc(100% - 15px);">
@@ -38,6 +72,16 @@
            </Form-item>
            <Form-item label="属性描述" prop="attrDesc">
                <i-input v-model="attributes.attrDesc" placeholder="属性描述"/>
+<!--                <div class="activityEdit">-->
+<!--                    <ul>-->
+<!--                        <li v-for="(item,index) in activity.condition" :key="index">-->
+<!--                            当满&nbsp;&nbsp;<i-input v-model="item.key" style="width: 77px"></i-input>&nbsp;&nbsp;-->
+<!--                            减&nbsp;&nbsp;<i-input v-model="item.value" style="width: 77px"></i-input>-->
+<!--                            <span @click="delCondition(item)">删除</span>-->
+<!--                        </li>-->
+<!--                    </ul>-->
+<!--                    <span @click="addCondition" class="activityAdd">添加</span>-->
+<!--                </div>-->
            </Form-item>
            <Form-item label="是否开启" prop="status">
 <!--                <i-input v-model="attributes.status" placeholder="状态 0：删除 1：正常"/>-->
@@ -51,11 +95,11 @@
                </Radio-group>
            </Form-item>
            <Form-item label="是否必填" prop="updateTime">
-                <Radio-group v-model="attributes.isNeed">
-                    <Radio label="true">
+                <Radio-group v-model="attributes.need">
+                    <Radio label="1">
                        <span>开启</span>
                    </Radio>
-                    <Radio label="false">
+                    <Radio label="0">
                        <span>关闭</span>
                    </Radio>
                </Radio-group>

--- a/platform-admin/src/main/webapp/js/sys/attributes.js
+++ b/platform-admin/src/main/webapp/js/sys/attributes.js
@@ -6,7 +6,7 @@ $(function () {
 			{label: '属性名', name: 'attrName', index: 'attr_name', width: 80},
 			{label: '属性描述', name: 'attrDesc', index: 'attr_desc', width: 80},
 			{label: '是否开启', name: 'status', index: 'status', width: 80},
-			{label: '是否必填', name: 'isNeed', index: 'isNeed', width: 80},
+			{label: '是否必填', name: 'need', index: 'need', width: 80},
 			{label: '排序', name: 'sort', index: 'sort', width: 80},
 			// {label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
 			// {label: '更新时间', name: 'updateTime', index: 'update_time', width: 80}
@@ -27,7 +27,8 @@ let vm = new Vue({
 		},
 		q: {
 		    name: ''
-		}
+		},
+		attrDesc:[]
 	},
 	methods: {
 		query: function () {
@@ -52,7 +53,12 @@ let vm = new Vue({
            let url = vm.attributes.id == null ? "../attributes/save" : "../attributes/update";
            console.log(vm.attributes)
 			vm.attributes.sort = parseInt(vm.attributes.sort)
-			vm.attributes.isNeed = parseInt(vm.attributes.isNeed)
+			vm.attributes.need = parseInt(vm.attributes.need)
+			if(vm.attributes.need == 0){
+				vm.attributes.need = false
+			}else {
+				vm.attributes.need = true
+			}
            Ajax.request({
 			    url: url,
                params: JSON.stringify(vm.attributes),
@@ -91,6 +97,7 @@ let vm = new Vue({
                async: true,
                successCallback: function (r) {
                    vm.attributes = r.attributes;
+
                }
            });
 		},