Merge remote-tracking branch 'origin/master'

src/views/sing_active/activeproductrecord.vue

@@ -63,15 +63,15 @@
             {
               label: "用户手机",
               prop: "phone",
-              type: "select",
-              dicUrl:"/api/sing_user/loginuser/list?current=1&size=999",
-              props: {
-                label: 'nickName',
-                value: 'phone',
-                desc: 'phone',
-                res: "data.records"
-              },
-              dicMethod:'get',
+              // type: "select",
+              // dicUrl:"/api/sing_user/loginuser/list?current=1&size=999",
+              // props: {
+              //   label: 'nickName',
+              //   value: 'phone',
+              //   desc: 'phone',
+              //   res: "data.records"
+              // },
+              // dicMethod:'get',
               rules: [{
                 required: true,
                 message: "请输入手机号码",

src/views/sing_desk/platformsetting.vue

@@ -198,6 +198,17 @@ export default {
               trigger: "blur"
             }],
           },
+          {
+            label: "排行显示总数",
+            prop: "rankTotal",
+            type: "number",
+            span: 12,
+            rules: [{
+              required: true,
+              message: "请输入排行显示总数",
+              trigger: "blur"
+            }],
+          },
           {
             label: "助力说明",
             prop: "helpExplain",

src/views/sing_goods/helpgoods.vue

@@ -91,7 +91,7 @@
               label: "移动商品道具ID",
               prop: "cmccGoodsId",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入移动商品道具ID",
                 trigger: "blur"
               }]
@@ -110,19 +110,21 @@
               label: "商品总数/人",
               prop: "total",
               type: "number",
+              value: -1,
               rules: [{
                 required: true,
-                message: "请输入商品总数/人",
+                message: "请输入商品总数/人(-1表示无限制)",
                 trigger: "blur"
               }]
             },
             {
-              label: "普法积分/个",
-              prop: "pufaPointRate",
+              label: "活动投票次数/活动/天/人",
+              prop: "activeVote",
               type: "number",
+              value: 1,
               rules: [{
                 required: true,
-                message: "请输入普法积分/个",
+                message: "请输入活动投票次数/活动/天/人",
                 trigger: "blur"
               }]
             },

src/views/sing_user/loginuser.vue

@@ -59,15 +59,6 @@
           selection: true,
           dialogClickModal: false,
           column: [
-            // {
-            //   label: "渠道积分",
-            //   prop: "channelPoint",
-            //   rules: [{
-            //     required: true,
-            //     message: "请输入渠道积分",
-            //     trigger: "blur"
-            //   }]
-            // },
             {
               label: "普法积分",
               prop: "pufaPoint",
@@ -88,25 +79,6 @@
                 trigger: "blur"
               }]
             },
-            {
-              label: "投票次数",
-              prop: "voteCount",
-              type: "number",
-              rules: [{
-                required: true,
-                message: "请输入投票次数",
-                trigger: "blur"
-              }]
-            },
-            // {
-            //   label: "账户余额",
-            //   prop: "balance",
-            //   rules: [{
-            //     required: true,
-            //     message: "请输入账户余额",
-            //     trigger: "blur"
-            //   }]
-            // },
             {
               label: "手机号码",
               prop: "phone",