diff --git a/pkg_join/views/shop.vue b/pkg_join/views/shop.vue
index dc69e7d..1c7df64 100644
--- a/pkg_join/views/shop.vue
+++ b/pkg_join/views/shop.vue
@@ -268,7 +268,7 @@
-
+
撤销申请
diff --git a/pkg_join/views/supplier.vue b/pkg_join/views/supplier.vue
index fd9f37d..a418584 100644
--- a/pkg_join/views/supplier.vue
+++ b/pkg_join/views/supplier.vue
@@ -189,8 +189,32 @@
-
-
+
+
+
+ *
+
+
+
+
+
+
+
+
+
+
*
@@ -205,6 +229,31 @@
+
+
+
+ *
+
+
+
+
+
+ 上传视频
+
+
+
+
+
@@ -328,7 +377,7 @@
-
+
撤销申请
@@ -373,7 +422,12 @@
import CitySelect from "@/components/CitySelect";
import {getShopData, getShopInfo, removeApply, saveSupplier, saveWenwanSupplier} from "@/api/join";
import {getCity, registerVerify} from "@/api/user";
-import {chooseImage, moreImage, uploadImage} from "@/utils";
+import {
+ chooseImage,
+ moreImage,
+ uploadImage,
+ chooseVideoToUpload
+} from "@/utils"
export default {
name: "pkgJoinSupplier",
@@ -403,6 +457,8 @@ export default {
form: {
name: "",
cover: "",
+ coverVideo: '',
+ coverType: 1, // coverType: 1-图片,2-视频
logo: "",
type: 0,
typeText: "",
@@ -481,6 +537,12 @@ export default {
message: '请上传店铺封面图',
trigger: ['blur', 'change']
},
+ 'coverVideo': {
+ type: 'string',
+ required: true,
+ message: '请上传店铺视频方面',
+ trigger: ['blur', 'change']
+ },
'logo': {
type: 'string',
required: true,
@@ -648,6 +710,10 @@ export default {
this.form.typeText = this.columnsType[0][this.indexType].name;
this.form.position = this.$forceToDecimal(this.form.longitude, 6) + ',' + this.$forceToDecimal(this.form.latitude, 6);
this.form.area = `${this.form.provinceName} ${this.form.cityName} ${this.form.areaName}`;
+ if (data.hotelInfo.coverType === 2) {
+ this.form.coverVideo = data.hotelInfo.cover
+ this.form.cover = ''
+ }
}
if (data.supplierInfo) {
@@ -681,6 +747,12 @@ export default {
}
});
},
+ chooseLogoVideo() {
+ chooseVideoToUpload(path => {
+ this.form.coverVideo = path
+ this.$forceUpdate()
+ })
+ },
chooseShopImg() {
let that = this;
@@ -839,9 +911,13 @@ export default {
this.quaPics.map(item => {
this.formSupplier.qualification += (item.url + ",");
})
+ const postData = Object.assign({}, this.form)
+ if (postData.coverType === 2) {
+ postData.cover = postData.coverVideo
+ }
if (this.infoTitle === "特产") {
- saveSupplier(this.form, this.formSupplier, this.partnerId).then(res => {
+ saveSupplier(postData, this.formSupplier, this.partnerId).then(res => {
if (res.status === 200) {
uni.showToast({
title: "您的入驻申请已提交成功,请耐心等待审核",
@@ -862,7 +938,7 @@ export default {
})
})
} else {
- saveWenwanSupplier(this.form, this.formSupplier, this.partnerId).then(res => {
+ saveWenwanSupplier(postData, this.formSupplier, this.partnerId).then(res => {
if (res.status === 200) {
uni.showToast({
title: "您的入驻申请已提交成功,请耐心等待审核",