Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/school-center/activity/activityRecord.vue

src/views/school-center/activity/activityIntegral.vue

@@ -51,11 +51,9 @@
 
         <!--列表-->
         <s-table  :locale="emptyText" :columns="columns" :data="rowdata" bordered ref="table" size="small" class="flex-filling">
-
-            <template slot="operation" slot-scope="text,record">
-                <a  @click="modifyfunction(record)">审核</a>
-
-            </template>
+          <template slot="createTime" slot-scope="text">
+            {{ text | dayjs}}
+          </template>
         </s-table>
 
         <!--编辑----弹框-->
@@ -131,22 +129,15 @@
                 },
                 modifyvisible: false,
                 columns: [
-                    {dataIndex: 'name', width: 200, title: '姓名', align: "center"},
-                    {dataIndex: 'account', width: 200, title: '账号', align: "center"},
-                    {dataIndex: 'recordIntegral', width: 200, title: '所得积分', align: "center"},
-                    {dataIndex: 'activityType', width: 200, title: '积分类型', align: "center"},
-                    {dataIndex: 'subclass', width: 200, title: '积分小类', align: "center"},
-                    {dataIndex: 'substName', width: 200, title: '县分', align: "center"},
+                    {dataIndex: 'name', width: 60, title: '姓名', align: "center"},
+                    {dataIndex: 'account', width: 80, title: '账号', align: "center"},
+                    {dataIndex: 'recordIntegral', width: 60, title: '所得积分', align: "center"},
+                    {dataIndex: 'activityType', width: 80, title: '积分类型', align: "center"},
+                    {dataIndex: 'subclass', width: 80, title: '积分大类', align: "center"},
+                    {dataIndex: 'substName', width: 40, title: '县分', align: "center"},
                     {dataIndex: 'schoolName', width: 200, title: '学校', align: "center"},
-                    {dataIndex: 'createTime', width: 200, title: '创建时间', align: "center"},
-                    {
-                        dataIndex: 'operation',
-                        width: 200,
-                        title: '操作',
-                        align: "center",
-                        scopedSlots: {customRender: 'operation'},
-                        fixed: "right"
-                    }]
+                    {dataIndex: 'createTime', width: 100, title: '创建时间', align: "center", scopedSlots: {customRender: 'createTime'},},
+                    ]
                 ,
                 rowdata: parameter => {
                     let params = {

src/views/school-center/activity/activityList.vue

@@ -130,11 +130,10 @@
     import {getList,addActivity,updateActivity,deleteActivity,uploadImg} from "../../../api/school-center/activity/activityAPI"
     import {cloneObject} from '@/utils/util';
     import { initSubstName} from "../../../api/school-center/userManager/newUserAPI";
-    import moment from "moment";
     export default {
         name: "activity",
         components: {
-            STable,moment
+            STable,
         },
         data: function () {
             return {
@@ -175,23 +174,15 @@
                 modifyvisible: false,
                 visiblepicture: false,
                 columns: [
-                    {dataIndex: 'title', width: 200, title: '活动标题', align: "center"},
+                    {dataIndex: 'title', width: 100, title: '活动标题', align: "center"},
                     {dataIndex: 'desc', width: 200, title: '活动详情', align: "center"},
-                    {dataIndex: 'integral', width: 200, title: '活动积分', align: "center"},
+                    {dataIndex: 'integral', width: 80, title: '活动积分', align: "center"},
                     {dataIndex: 'imageUrl', title: '图片 ', scopedSlots: {customRender: 'imageUrl'},align: 'center'},
-                    {dataIndex: 'activityType', width: 200, title: '活动类型', align: "center"},
-                    {dataIndex: 'subclass', width: 200, title: '活动小类', align: "center"},
-                    {dataIndex: 'sort', width: 200, title: '排序号', align: "center"},
-                    {dataIndex: 'creator', width: 200, title: '创建人', align: "center"},
-                    {dataIndex: 'createTime', width: 200, title: '创建时间', align: "center",
-                      customRender: function (text, record, index) {
-                        //text:当前行的值,record: 当前行的数据, index：索引
-                        if (text == null) {
-                          return "";
-                        }
-                        return moment(text).format("YYYY-MM-DD HH:mm:ss");
-                      },
-                    },
+                    {dataIndex: 'activityType', width: 80, title: '活动类型', align: "center"},
+                    {dataIndex: 'subclass', width: 80, title: '活动大类', align: "center"},
+                    {dataIndex: 'sort', width: 80, title: '排序号', align: "center"},
+                    {dataIndex: 'creator', width: 80, title: '创建人', align: "center"},
+                    {dataIndex: 'createTime', width: 200, title: '创建时间', align: "center", scopedSlots: {customRender: 'createTime'}},
                     {
                         dataIndex: 'operation',
                         width: 200,

src/views/school-center/activity/activityRecord.vue

@@ -65,13 +65,20 @@
         <s-table  :locale="emptyText" :columns="columns" :data="rowdata" bordered ref="table" size="small" class="flex-filling"
                   :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
 
+          <template slot="createTime" slot-scope="text">
+            {{ text | dayjs}}
+          </template>
+            <template slot="imageUrl" slot-scope="text">
+              <img style="width: 20%" :src="apis + text" @click="imgClick(text)">
+            </template>
             <template slot="status" slot-scope="text">
-              <span v-if="text=='1'">未审核</span>
-              <span v-if="text=='2'">审核通过</span>
-              <span v-if="text=='3'">审核不通过</span>
+                <span v-if="text == 1">未审核</span>
+                <span v-if="text == 2">审核通过</span>
+                <span v-if="text == 3">审核不通过</span>
             </template>
+
             <template slot="operation" slot-scope="text,record">
-                <a  @click="checkFunction(record)">查看</a>
+                <a v-if="record.status == 1"  @click="modifyfunction(record)">审核</a>
             </template>
         </s-table>
 
@@ -90,16 +97,16 @@
             </a-radio-group>
           </a-form-item>
 
-          <a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="所得积分">
-            <a-input placeholder="所得积分" v-decorator="[ 'integral', {rules: [{ required: true,type:'number', message: '所得积分不能为空！' ,whitespace:true,transform:(value)=> {return Number(value)} }]} ]"></a-input>
-          </a-form-item>
+                <a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="所得积分">
+                    <a-input placeholder="所得积分" v-decorator="[ 'integral', {rules: [{ required: true,type:'number', message: '所得积分不能为空！' ,whitespace:true,transform:(value)=> {return Number(value)} }]} ]"></a-input>
+                </a-form-item>
 
-          <a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="审核备注">
-            <a-input placeholder="审核备注" v-decorator="[ 'remark', {rules: [{ required: false }]} ]"></a-input>
-          </a-form-item>
+                <a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="审核备注">
+                    <a-input placeholder="审核备注" v-decorator="[ 'remark', {rules: [{ required: false }]} ]"></a-input>
+                </a-form-item>
 
-        </a-form>
-      </a-modal>
+            </a-form>
+        </a-modal>
     </div>
 </template>
 
@@ -147,37 +154,33 @@
                 modifyvisible: false,
                 checkVisible: false,
                 columns: [
-                    {dataIndex: 'title', width: 200, title: '活动标题', align: "center"},
+                    {dataIndex: 'title', width: 80, title: '活动标题', align: "center"},
                     {dataIndex: 'desc', width: 200, title: '活动详情', align: "center"},
-                    {dataIndex: 'activityType', width: 200, title: '活动类型', align: "center"},
-                    {dataIndex: 'subclass', width: 200, title: '活动小类', align: "center"},
-                    {dataIndex: 'integral', width: 200, title: '活动积分', align: "center"},
-                    {dataIndex: 'status', width: 200, title: '审核状态', align: "center", scopedSlots: {customRender: "status"}},
-                    {dataIndex: 'remark', width: 200, title: '审核备注', align: "center"},
-                    {dataIndex: 'recordIntegral', width: 200, title: '所得积分', align: "center"},
-                    {dataIndex: 'creator', width: 200, title: '参与者', align: "center"},
+                    {dataIndex: 'activityType', width: 80, title: '活动类型', align: "center"},
+                    {dataIndex: 'subclass', width: 80, title: '活动大类', align: "center"},
+                    {dataIndex: 'integral', width: 80, title: '活动积分', align: "center"},
+                    {dataIndex: 'status', width: 80, title: '审核状态', align: "center",
+                        scopedSlots: {customRender: 'status'}},
+                    {dataIndex: 'remark', width: 100, title: '审核备注', align: "center"},
+                    {dataIndex: 'recordIntegral', width: 80, title: '所得积分', align: "center"},
+                    {dataIndex: 'creator', width: 100, title: '参与者', align: "center"},
                     {dataIndex: 'message', width: 200, title: '活动留言', align: "center"},
-                    {dataIndex: 'createTime', width: 200, title: '参与时间', align: "center",
-                      customRender: function (text, record, index) {
-                        //text:当前行的值,record: 当前行的数据, index：索引
-                        if (text == null) {
-                          return "";
-                        }
-                        return moment(text).format("YYYY-MM-DD HH:mm:ss");
-                      },
-                    },
-                    {dataIndex: 'isRepeal', width: 200, title: '是否重复参与', align: "center"},
+                    {dataIndex: 'imageUrl', width: 100, title: '参与图片', align: "center",scopedSlots: {customRender: 'imageUrl'}},
+                    {dataIndex: 'createTime', width: 100, title: '参与时间', align: "center",
+                        scopedSlots: {customRender: 'createTime'}},
+                    {dataIndex: 'isRepeal', width: 100, title: '是否重复参与', align: "center"},
                     {
                         dataIndex: 'operation',
-                        width: 200,
+                        width: 100,
                         title: '操作',
                         align: "center",
                         scopedSlots: {customRender: 'operation'},
                         fixed: "right"
-                    },
-                    ]
-                ,
+                    }],
                 rowdata: parameter => {
+
+                    const env = process.env.NODE_ENV; //获取当前环境
+
                     let params = {
                         pageNo: parameter.pageNo,
                         pageSize: parameter.pageSize
@@ -220,12 +223,16 @@
             search() {
                 this.$refs.table.refresh({search: true})
             },
-            checkFunction(data){
-              console.log(data);
-              this.checkVisible = true;
-            },
-            checkCancel(){
-              this.checkVisible = false;
+            modifyfunction(data){
+                //初始化
+                this.titleName="审核"
+                this.modifyForm.id = data.id
+                this.modifyvisible=true;
+                setTimeout(()=>{
+                    this.Formtable.setFieldsValue({
+                      integral: data.integral
+                    })
+                },0)
             },
             //提交表单
             createfunctionOk(){
@@ -236,7 +243,7 @@
                         }
                         //表示
                         this.modifyForm.status=values.status
-                        this.modifyForm.remark=values.remark
+                        this.modifyForm.remark=values.remark == undefined ? '' : values.remark;
                         this.modifyForm.integral=values.integral
                         //表示
                         let obj = cloneObject(this.modifyForm)
@@ -268,6 +275,15 @@
                 this.modifyForm.id=""
                 this.modifyvisible=false;
             },
+            imgClick(res){
+              this.imgInfo=this.apis + res
+              this.visiblepicture=true
+            },
+            pictureOnClose() {
+              this.imgInfo=''
+              this.visiblepicture = false;
+            },
+            },
             start() {
               this.Formtable.setFieldsValue({
                 status: '',

src/views/school-center/productManagement/package.vue

@@ -170,8 +170,8 @@
                 fileListxiaotu:[],
 
                 fileid:{},
-                brackgroundurl:"app/ciop/packageManagement/package/backgroundUpload",
-                xiaotuurl:"app/ciop/packageManagement/package/xiaotuUpload",
+                brackgroundurl:"manager/ciop/packageManagement/package/backgroundUpload",
+                xiaotuurl:"manager/ciop/packageManagement/package/xiaotuUpload",
                 Formtable: this.$form.createForm(this, {name: 'Formtable'}),
                 //输入框列表
                 autoCompleteResult:[],

src/views/school-center/schoolmanager/schoolmanagement.vue

@@ -663,7 +663,7 @@
                 this.packageName.forEach(pName => {
                     temp.push(pName);
                 })
-
+                this.package = [];
                 //查询中间表
                 choosepages(choosepagespare).then(res=>{
                     if (res.state == 'success'){