|
@@ -78,11 +78,11 @@
|
|
|
<span>{{ formInline.paymentType == 1 ? '积分' : '元' }}</span>
|
|
<span>{{ formInline.paymentType == 1 ? '积分' : '元' }}</span>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
- <div v-if="formInline.paymentType == 3">
|
|
|
|
|
- <el-input-number v-model="scope.row.pricePoint" controls-position="right"
|
|
|
|
|
|
|
+ <div v-if="formInline.paymentType == 3" style="display: flex;width: 100%;">
|
|
|
|
|
+ <el-input-number style="width:140px" v-model="scope.row.pricePoint" controls-position="right"
|
|
|
:min="0"></el-input-number>
|
|
:min="0"></el-input-number>
|
|
|
<span>元 +</span>
|
|
<span>元 +</span>
|
|
|
- <el-input-number v-model="scope.row.pricePoint" controls-position="right"
|
|
|
|
|
|
|
+ <el-input-number style="width:140px" v-model="scope.row.pricePoint" controls-position="right"
|
|
|
:min="0"></el-input-number>
|
|
:min="0"></el-input-number>
|
|
|
<span>积分</span>
|
|
<span>积分</span>
|
|
|
</div>
|
|
</div>
|
|
@@ -149,15 +149,18 @@
|
|
|
<div style="display: flex;justify-content: center;margin-top: 25px;">
|
|
<div style="display: flex;justify-content: center;margin-top: 25px;">
|
|
|
<el-button @click="dialogVisible = false">取 消</el-button>
|
|
<el-button @click="dialogVisible = false">取 消</el-button>
|
|
|
<el-button type="primary" @click="addOrEditOrDetailSave">保存</el-button>
|
|
<el-button type="primary" @click="addOrEditOrDetailSave">保存</el-button>
|
|
|
|
|
+ <!-- <el-button type="primary" @click="previewFun">预览</el-button> -->
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
</el-dialog>
|
|
</el-dialog>
|
|
|
|
|
+ <!-- 保存预览 -->
|
|
|
|
|
+ <SavePreview ref="savePreviewRef" @savePreviewFun="savePreviewFun"></SavePreview>
|
|
|
|
|
|
|
|
</div>
|
|
</div>
|
|
|
</template>
|
|
</template>
|
|
|
<script>
|
|
<script>
|
|
|
-
|
|
|
|
|
|
|
+import SavePreview from './savePreview.vue'
|
|
|
import tableCompontent from "@/components/tableCompontent/index.vue";
|
|
import tableCompontent from "@/components/tableCompontent/index.vue";
|
|
|
import Tinymce from "@/components/tinymce/index.vue";
|
|
import Tinymce from "@/components/tinymce/index.vue";
|
|
|
import { productSpecSetup, productGenerateProductNo, productSpecCombinations, productUpdate } from "@/api/points/pointsMall_api";
|
|
import { productSpecSetup, productGenerateProductNo, productSpecCombinations, productUpdate } from "@/api/points/pointsMall_api";
|
|
@@ -165,7 +168,7 @@ import { upload } from "@/api/public";
|
|
|
import { setTimeout } from "core-js";
|
|
import { setTimeout } from "core-js";
|
|
|
export default {
|
|
export default {
|
|
|
components: {
|
|
components: {
|
|
|
- Tinymce, tableCompontent
|
|
|
|
|
|
|
+ Tinymce, tableCompontent, SavePreview
|
|
|
},
|
|
},
|
|
|
props: {
|
|
props: {
|
|
|
shopType: {
|
|
shopType: {
|
|
@@ -314,6 +317,19 @@ export default {
|
|
|
// this.updataImg11.push(response.fileName)
|
|
// this.updataImg11.push(response.fileName)
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
|
|
+ previewFun() {
|
|
|
|
|
+ this.formInline.skuList = this.tableForm.skuList
|
|
|
|
|
+ this.$refs.savePreviewRef.showPage(JSON.parse(JSON.stringify(this.formInline)))
|
|
|
|
|
+ },
|
|
|
|
|
+ //预览后保存
|
|
|
|
|
+ savePreviewFun(params) {
|
|
|
|
|
+ productUpdate(params).then(res => {
|
|
|
|
|
+ this.$message.success(res.msg)
|
|
|
|
|
+ this.dialogVisible = false
|
|
|
|
|
+ this.$emit("getList");
|
|
|
|
|
+ })
|
|
|
|
|
+ },
|
|
|
|
|
+
|
|
|
//新增、编辑、详情商品 ----保存
|
|
//新增、编辑、详情商品 ----保存
|
|
|
addOrEditOrDetailSave() {
|
|
addOrEditOrDetailSave() {
|
|
|
console.log(this.formInline, 'formInline')
|
|
console.log(this.formInline, 'formInline')
|
|
@@ -335,12 +351,8 @@ export default {
|
|
|
//组装规格列表数据
|
|
//组装规格列表数据
|
|
|
params.specList = this.specListReorganizeFun(this.formInline.specList)
|
|
params.specList = this.specListReorganizeFun(this.formInline.specList)
|
|
|
params.skuList = this.tableForm.skuList
|
|
params.skuList = this.tableForm.skuList
|
|
|
- console.log(params, 'params')
|
|
|
|
|
- productUpdate(params).then(res => {
|
|
|
|
|
- this.$message.success(res.msg)
|
|
|
|
|
- this.dialogVisible = false
|
|
|
|
|
- this.$emit("getList");
|
|
|
|
|
- })
|
|
|
|
|
|
|
+ this.$refs.savePreviewRef.showPage(JSON.parse(JSON.stringify(params)))
|
|
|
|
|
+
|
|
|
} else {
|
|
} else {
|
|
|
this.$message.error("请完善规格明细信息!");
|
|
this.$message.error("请完善规格明细信息!");
|
|
|
}
|
|
}
|