Commit 7f47ae84 authored by chenwei's avatar chenwei

Merge branch 'hotfix/preReleaseDefect' into 'pre-release'

Hotfix/pre release defect

See merge request !53
parents 7ca7b1fb c5a873c8
...@@ -51,12 +51,12 @@ ...@@ -51,12 +51,12 @@
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('中文封面图')" prop="coverImageZh"> <el-form-item :label="$t('中文封面图')" prop="coverImageZh">
<image-upload v-model="queryParams.coverImageZh" /> <image-upload v-model="queryParams.coverImageZh" :isShowEditButton="!showViewTime"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('英文封面图')" prop="coverImageEn"> <el-form-item :label="$t('英文封面图')" prop="coverImageEn">
<image-upload v-model="queryParams.coverImageEn" /> <image-upload v-model="queryParams.coverImageEn" :isShowEditButton="!showViewTime"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -473,6 +473,7 @@ ...@@ -473,6 +473,7 @@
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
<el-button <el-button
v-if="$route.query.pageStatus != 'view'"
type="primary" type="primary"
style="width: 100%" style="width: 100%"
@click="handleResetIntegralRule" @click="handleResetIntegralRule"
...@@ -997,7 +998,7 @@ export default { ...@@ -997,7 +998,7 @@ export default {
} else { } else {
this.handleGetRegionTreeList(); this.handleGetRegionTreeList();
} }
this.queryParams.extraShare.activityUrl = process.env.NODE_ENV == 'production' ?'https://app2.groupage.cn/#/pages/activityShare/index':"https://apptest.groupage.cn/#/pages/activityShare/index" this.queryParams.extraShare.activityUrl = '/pages/activityShare/index'
}, },
activated() {}, activated() {},
methods: { methods: {
......
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
width="180" width="180"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) || "--" }}</span> <span>{{ parseTime(scope.row.lastTriggerTime) || "--" }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment