|
@@ -1,8 +1,5 @@
|
|
|
<template>
|
|
<template>
|
|
|
<view>
|
|
<view>
|
|
|
- <!-- <cu-custom bgColor="bg-fff" :isBack="true">
|
|
|
|
|
- <block slot="content"> 经营信息</block>
|
|
|
|
|
- </cu-custom> -->
|
|
|
|
|
<view class="top"></view>
|
|
<view class="top"></view>
|
|
|
<view class="head">
|
|
<view class="head">
|
|
|
<view class="handle">
|
|
<view class="handle">
|
|
@@ -10,12 +7,11 @@
|
|
|
<span class="cuIcon-back" @click="back"></span>
|
|
<span class="cuIcon-back" @click="back"></span>
|
|
|
</view>
|
|
</view>
|
|
|
<span class="center">经营信息</span>
|
|
<span class="center">经营信息</span>
|
|
|
- <view class="head_right">
|
|
|
|
|
- </view>
|
|
|
|
|
|
|
+ <view class="head_right"></view>
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
<status v-if="form && form.videoStatus !== null" :status="form.videoStatus" :updateTime="form.videoUpdateTime"
|
|
<status v-if="form && form.videoStatus !== null" :status="form.videoStatus" :updateTime="form.videoUpdateTime"
|
|
|
- :remark="form.videoRemark"></status>
|
|
|
|
|
|
|
+ :remark="form.videoRemark" style="z-index: 0;"></status>
|
|
|
<view class="tab-top" :style="form && form.videoStatus == null ? 'margin-top: 14upx;' : 'margin-top: 144upx;'">
|
|
<view class="tab-top" :style="form && form.videoStatus == null ? 'margin-top: 14upx;' : 'margin-top: 144upx;'">
|
|
|
<view class="borderRadiu">
|
|
<view class="borderRadiu">
|
|
|
<view class=" cu-form-group margin-top1 justify-between">
|
|
<view class=" cu-form-group margin-top1 justify-between">
|
|
@@ -66,11 +62,15 @@
|
|
|
</view>
|
|
</view>
|
|
|
<view class="customize">
|
|
<view class="customize">
|
|
|
<view class="title">地理位置</view>
|
|
<view class="title">地理位置</view>
|
|
|
- <view class=" booder-top" style="padding-bottom: 16upx" :style="{ 'display': mapIsHidden }"
|
|
|
|
|
|
|
+ <!-- 修复:mapIsHidden 应为字符串 'block'/'none',避免样式解析错误 -->
|
|
|
|
|
+ <view class=" booder-top" style="padding-bottom: 16upx" :style="{ display: mapIsHidden }"
|
|
|
@click="selectAddress">
|
|
@click="selectAddress">
|
|
|
- <!-- <map :key="mapKey" style="width: 100%; height: 218upx;z-index:99" :latitude="latitude" scale="14"
|
|
|
|
|
- zIndex="100" :longitude="longitude" :markers="marker" @tap="handleMarkerTap"></map> -->
|
|
|
|
|
- <tdmap style="" :initialPosition="savedLocation" :allowSelection="false" :showCoordinates="false" :key="mapKey"></tdmap>
|
|
|
|
|
|
|
+ <tdmap
|
|
|
|
|
+ :initialPosition="savedLocation"
|
|
|
|
|
+ :allowSelection="false"
|
|
|
|
|
+ :showCoordinates="false"
|
|
|
|
|
+ :key="mapKey"
|
|
|
|
|
+ ></tdmap>
|
|
|
</view>
|
|
</view>
|
|
|
<view class="business-prompt">
|
|
<view class="business-prompt">
|
|
|
若位置有误直接影响客户到店,请在地图中仔细核对,可拖拽地图确保位置正确
|
|
若位置有误直接影响客户到店,请在地图中仔细核对,可拖拽地图确保位置正确
|
|
@@ -82,24 +82,18 @@
|
|
|
<button class="cu-btn round line-gray shadow" @click="$Router.push({ name: 'settings' })">取消</button>
|
|
<button class="cu-btn round line-gray shadow" @click="$Router.push({ name: 'settings' })">取消</button>
|
|
|
<button style="margin-left: 12upx;width:77%" class="cu-btn bg-blue round " @click.native="sumbit">提交审核</button>
|
|
<button style="margin-left: 12upx;width:77%" class="cu-btn bg-blue round " @click.native="sumbit">提交审核</button>
|
|
|
</view>
|
|
</view>
|
|
|
-
|
|
|
|
|
<u-picker v-model="show" mode="time" @confirm="selectTime" style="z-index: 999 !important;"></u-picker>
|
|
<u-picker v-model="show" mode="time" @confirm="selectTime" style="z-index: 999 !important;"></u-picker>
|
|
|
</view>
|
|
</view>
|
|
|
-
|
|
|
|
|
</template>
|
|
</template>
|
|
|
|
|
+
|
|
|
<script>
|
|
<script>
|
|
|
import configService from "../../common/service/config.service";
|
|
import configService from "../../common/service/config.service";
|
|
|
- import {
|
|
|
|
|
- USER_INFO
|
|
|
|
|
- } from "@/common/util/constants";
|
|
|
|
|
|
|
+ import { USER_INFO } from "@/common/util/constants";
|
|
|
import status from "./components/status.vue";
|
|
import status from "./components/status.vue";
|
|
|
import tdmap from "./tdtuMap.vue"
|
|
import tdmap from "./tdtuMap.vue"
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
|
- components: {
|
|
|
|
|
- status,
|
|
|
|
|
- tdmap
|
|
|
|
|
- },
|
|
|
|
|
|
|
+ components: { status, tdmap },
|
|
|
data() {
|
|
data() {
|
|
|
return {
|
|
return {
|
|
|
video: "",
|
|
video: "",
|
|
@@ -119,161 +113,96 @@
|
|
|
height: 30,
|
|
height: 30,
|
|
|
label: {
|
|
label: {
|
|
|
content: "",
|
|
content: "",
|
|
|
- color: "#000000", // 文字颜色
|
|
|
|
|
- fontSize: 14, // 文字大小
|
|
|
|
|
|
|
+ color: "#000000",
|
|
|
|
|
+ fontSize: 14,
|
|
|
bgColor: "#FFFFFF",
|
|
bgColor: "#FFFFFF",
|
|
|
borderColor: "#CCCCCC",
|
|
borderColor: "#CCCCCC",
|
|
|
},
|
|
},
|
|
|
- }, ], // 初始为空数组
|
|
|
|
|
- mapIsHidden: true,
|
|
|
|
|
|
|
+ }],
|
|
|
|
|
+ mapIsHidden: 'block', // 修复:初始为block,确保地图容器显示
|
|
|
mapKey: 1,
|
|
mapKey: 1,
|
|
|
- savedLocation: {}
|
|
|
|
|
|
|
+ // 修复:初始化savedLocation为合法对象,避免undefined
|
|
|
|
|
+ savedLocation: { lng: 112.55, lat: 37.87 }
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
|
- onLoad(data) {
|
|
|
|
|
|
|
+ onLoad(data) {
|
|
|
if (data.params) {
|
|
if (data.params) {
|
|
|
let obj = JSON.parse(decodeURIComponent(data.params));
|
|
let obj = JSON.parse(decodeURIComponent(data.params));
|
|
|
- this.video = obj.video ? obj.video : ''
|
|
|
|
|
- obj.photo = obj.photo ? obj.photo.split(',').filter(id => id !== '') : []
|
|
|
|
|
- this.form = obj
|
|
|
|
|
- this.date = this.form.openingTime
|
|
|
|
|
- // this.savedLocation.lnglat = {
|
|
|
|
|
- // lng: obj.longitude || 0,
|
|
|
|
|
- // lat: obj.latitude || 0,
|
|
|
|
|
- // };
|
|
|
|
|
- // this.savedLocation.address = obj.address || '位置';
|
|
|
|
|
- // this.latitude = obj.lat;
|
|
|
|
|
- // this.longitude = obj.lng;
|
|
|
|
|
|
|
+ this.video = obj.video ? obj.video : '';
|
|
|
|
|
+ obj.photo = obj.photo ? obj.photo.split(',').filter(id => id !== '') : [];
|
|
|
|
|
+ this.form = obj;
|
|
|
|
|
+ this.date = this.form.openingTime;
|
|
|
|
|
+
|
|
|
|
|
+ // 修复:从obj中赋值坐标,确保数字类型
|
|
|
|
|
+ if (obj.longitude && obj.latitude) {
|
|
|
|
|
+ this.savedLocation = {
|
|
|
|
|
+ lng: Number(obj.longitude) || 112.55,
|
|
|
|
|
+ lat: Number(obj.latitude) || 37.87,
|
|
|
|
|
+ address: obj.address || '位置'
|
|
|
|
|
+ };
|
|
|
|
|
+ this.latitude = obj.latitude;
|
|
|
|
|
+ this.longitude = obj.longitude;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
onShow() {
|
|
onShow() {
|
|
|
this.$http
|
|
this.$http
|
|
|
- .get(
|
|
|
|
|
- "/merchant/localMerchantTime/list?merchantId=" +
|
|
|
|
|
- uni.getStorageSync(USER_INFO).merchantId
|
|
|
|
|
- )
|
|
|
|
|
|
|
+ .get("/merchant/localMerchantTime/list?merchantId=" + uni.getStorageSync(USER_INFO).merchantId)
|
|
|
.then((res) => {
|
|
.then((res) => {
|
|
|
if (res.data.success) {
|
|
if (res.data.success) {
|
|
|
this.businessData = res.data.result;
|
|
this.businessData = res.data.result;
|
|
|
} else {
|
|
} else {
|
|
|
- this.$tip.error(res.data.message);
|
|
|
|
|
|
|
+ uni.showToast({ icon:'none', title:res.data.message });
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
- let da = uni.getStorageSync("address");
|
|
|
|
|
- console.log(da)
|
|
|
|
|
- // let addname = uni.getStorageSync("currentAddress");
|
|
|
|
|
- // const lat = parseFloat(da.lng) || 37.860372;
|
|
|
|
|
- // const lng = parseFloat(da.lat) || 112.588154;
|
|
|
|
|
- // const labelContent = da?.address || "未设置地址";
|
|
|
|
|
|
|
|
|
|
|
|
+ // 修复:安全获取存储的地址,避免da为undefined
|
|
|
|
|
+ let da = uni.getStorageSync("address") || {};
|
|
|
|
|
+ console.log('存储的地址信息:', da);
|
|
|
|
|
+
|
|
|
|
|
+ // 核心:确保lng/lat是合法数字,兜底默认值
|
|
|
|
|
+ const lng = Number(da.lng) || 112.55;
|
|
|
|
|
+ const lat = Number(da.lat) || 37.87;
|
|
|
|
|
|
|
|
- this.savedLocation.lng = da.lng
|
|
|
|
|
- this.savedLocation.lat = da.lat
|
|
|
|
|
- this.savedLocation.address = da.address || '位置';
|
|
|
|
|
- this.latitude = da.lat;
|
|
|
|
|
- this.longitude = da.lng;
|
|
|
|
|
- this.mapKey += 1;
|
|
|
|
|
- // this.marker[0].longitude = da.longitude
|
|
|
|
|
- // this.marker[0].latitude = da.latitude
|
|
|
|
|
- // this.marker[0].label.content = addname.name
|
|
|
|
|
- // this.marker = [{
|
|
|
|
|
- // latitude: lat, // 默认值避免 undefined
|
|
|
|
|
- // longitude: lng, // 默认值避免 undefined
|
|
|
|
|
- // iconPath: "/static/boiaoji.png",
|
|
|
|
|
- // width: 30,
|
|
|
|
|
- // height: 30,
|
|
|
|
|
- // label: {
|
|
|
|
|
- // content: labelContent, // 避免 addname 为 undefined
|
|
|
|
|
- // color: "#000000",
|
|
|
|
|
- // fontSize: 14,
|
|
|
|
|
- // bgColor: "#FFFFFF",
|
|
|
|
|
- // borderColor: "#CCCCCC",
|
|
|
|
|
- // },
|
|
|
|
|
- // }, ];
|
|
|
|
|
-
|
|
|
|
|
- // this.getCurrentLocation();
|
|
|
|
|
|
|
+ // 更新savedLocation(触发子组件props更新)
|
|
|
|
|
+ this.savedLocation = {
|
|
|
|
|
+ lng: lng,
|
|
|
|
|
+ lat: lat,
|
|
|
|
|
+ address: da.address || '位置'
|
|
|
|
|
+ };
|
|
|
|
|
+ this.latitude = lat;
|
|
|
|
|
+ this.longitude = lng;
|
|
|
|
|
+
|
|
|
|
|
+ // 优化:仅当坐标变化时更新mapKey,避免频繁刷新
|
|
|
|
|
+ if (lng !== 112.55 || lat !== 37.87) {
|
|
|
|
|
+ this.mapKey += 1;
|
|
|
|
|
+ }
|
|
|
},
|
|
},
|
|
|
methods: {
|
|
methods: {
|
|
|
back() {
|
|
back() {
|
|
|
- uni.navigateTo({
|
|
|
|
|
- url: '/pages/store/settings'
|
|
|
|
|
- })
|
|
|
|
|
|
|
+ uni.navigateTo({ url: '/pages/store/settings' });
|
|
|
},
|
|
},
|
|
|
selectAddress() {
|
|
selectAddress() {
|
|
|
- uni.navigateTo({
|
|
|
|
|
- url: '/pages/store/selectTdMap?url=' + '/pages/store/businessInfor'
|
|
|
|
|
- })
|
|
|
|
|
|
|
+ uni.navigateTo({ url: '/pages/store/selectTdMap?url=' + '/pages/store/businessInfor' });
|
|
|
},
|
|
},
|
|
|
- // getCurrentLocation() {
|
|
|
|
|
- // uni.getStorage({
|
|
|
|
|
- // key: "currentAddress",
|
|
|
|
|
- // success: (res) => {
|
|
|
|
|
- // if (res.data && res.data.location) {
|
|
|
|
|
- // let temp = res.data.location.split(",");
|
|
|
|
|
- // this.latitude = temp[1];
|
|
|
|
|
- // this.longitude = temp[0];
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
- // // this.marker = [{
|
|
|
|
|
- // // id: 0,
|
|
|
|
|
- // // latitude: temp[1],
|
|
|
|
|
- // // longitude: temp[0],
|
|
|
|
|
- // // title: res.data.name || '当前位置',
|
|
|
|
|
- // // iconPath: '../../static/boiaoji.png',
|
|
|
|
|
- // // width: 30,
|
|
|
|
|
- // // height: 30,
|
|
|
|
|
- // // callout: { // 添加标注说明
|
|
|
|
|
- // // content: res.data.name || '当前位置',
|
|
|
|
|
- // // color: '#000',
|
|
|
|
|
- // // fontSize: 12,
|
|
|
|
|
- // // borderRadius: 10,
|
|
|
|
|
- // // bgColor: '#fff',
|
|
|
|
|
- // // padding: 5,
|
|
|
|
|
- // // display: 'ALWAYS'
|
|
|
|
|
- // // }
|
|
|
|
|
- // // }];
|
|
|
|
|
- // this.$forceUpdate();
|
|
|
|
|
- // }
|
|
|
|
|
- // },
|
|
|
|
|
- // fail: () => {
|
|
|
|
|
- // // 如果没有存储的位置,可以设置默认位置
|
|
|
|
|
- // // this.setDefaultLocation();
|
|
|
|
|
- // },
|
|
|
|
|
- // });
|
|
|
|
|
- // },
|
|
|
|
|
-
|
|
|
|
|
handleMarkerTap() {
|
|
handleMarkerTap() {
|
|
|
const queryString = uni.getStorageSync("address") ?
|
|
const queryString = uni.getStorageSync("address") ?
|
|
|
- encodeURIComponent(JSON.stringify(uni.getStorageSync("address"))) :
|
|
|
|
|
- "";
|
|
|
|
|
- uni.navigateTo({
|
|
|
|
|
- url: `/pages/login/map?position=${queryString}`,
|
|
|
|
|
- // url:'/pages/login/map'
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ encodeURIComponent(JSON.stringify(uni.getStorageSync("address"))) : "";
|
|
|
|
|
+ uni.navigateTo({ url: `/pages/login/map?position=${queryString}` });
|
|
|
},
|
|
},
|
|
|
selectTime(e) {
|
|
selectTime(e) {
|
|
|
- console.log(e);
|
|
|
|
|
this.date = e.year + "-" + e.month + "-" + e.day;
|
|
this.date = e.year + "-" + e.month + "-" + e.day;
|
|
|
},
|
|
},
|
|
|
hoursChange(index) {
|
|
hoursChange(index) {
|
|
|
- const queryString = encodeURIComponent(
|
|
|
|
|
- JSON.stringify({
|
|
|
|
|
- index,
|
|
|
|
|
- arr: this.businessData,
|
|
|
|
|
- })
|
|
|
|
|
- );
|
|
|
|
|
- uni.navigateTo({
|
|
|
|
|
- url: `/pages/store/addHours?params=${queryString}`,
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ const queryString = encodeURIComponent(JSON.stringify({ index, arr: this.businessData }));
|
|
|
|
|
+ uni.navigateTo({ url: `/pages/store/addHours?params=${queryString}` });
|
|
|
},
|
|
},
|
|
|
delectVideo() {
|
|
delectVideo() {
|
|
|
uni.showModal({
|
|
uni.showModal({
|
|
|
title: "提示",
|
|
title: "提示",
|
|
|
content: "是否要删除此视频",
|
|
content: "是否要删除此视频",
|
|
|
success: (res) => {
|
|
success: (res) => {
|
|
|
- if (res.confirm) {
|
|
|
|
|
- this.video = "";
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ if (res.confirm) this.video = "";
|
|
|
},
|
|
},
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
@@ -284,73 +213,45 @@
|
|
|
cancelText: "取消",
|
|
cancelText: "取消",
|
|
|
confirmText: "确定",
|
|
confirmText: "确定",
|
|
|
success: (res) => {
|
|
success: (res) => {
|
|
|
- if (res.confirm) {
|
|
|
|
|
- // this.photoList.splice(e.currentTarget.dataset.index, 1)
|
|
|
|
|
- this.form.photo.splice(e.currentTarget.dataset.index, 1);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ if (res.confirm) this.form.photo.splice(e.currentTarget.dataset.index, 1);
|
|
|
},
|
|
},
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
|
ChooseImage() {
|
|
ChooseImage() {
|
|
|
uni.chooseImage({
|
|
uni.chooseImage({
|
|
|
- // count: 4, //默认9
|
|
|
|
|
- sizeType: ["original", "compressed"], //可以指定是原图还是压缩图,默认二者都有
|
|
|
|
|
- sourceType: ["album"], //从相册选择
|
|
|
|
|
|
|
+ sizeType: ["original", "compressed"],
|
|
|
|
|
+ sourceType: ["album"],
|
|
|
success: (res) => {
|
|
success: (res) => {
|
|
|
- if (res) {
|
|
|
|
|
- // this[type + 'Img'] = chooseImageRes.tempFilePaths[0];
|
|
|
|
|
- uni.uploadFile({
|
|
|
|
|
- url: configService.apiUrl + "/sys/common/upload",
|
|
|
|
|
- filePath: res.tempFilePaths[0],
|
|
|
|
|
- name: "file",
|
|
|
|
|
- formData: {
|
|
|
|
|
- biz: "temp",
|
|
|
|
|
- },
|
|
|
|
|
- success: (files) => {
|
|
|
|
|
- let data = JSON.parse(files.data);
|
|
|
|
|
- if (data.success) {
|
|
|
|
|
- if (this.form.photo.length != 0) {
|
|
|
|
|
- // this.photoList = this.photoList.concat(res.tempFilePaths)
|
|
|
|
|
- this.form.photo.push(
|
|
|
|
|
- configService.apiUrl + "/" + data.message
|
|
|
|
|
- );
|
|
|
|
|
- } else {
|
|
|
|
|
- // this.photoList =res.tempFilePaths
|
|
|
|
|
- this.form.photo = [
|
|
|
|
|
- configService.apiUrl + "/" + data.message,
|
|
|
|
|
- ];
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- },
|
|
|
|
|
- });
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ uni.uploadFile({
|
|
|
|
|
+ url: configService.apiUrl + "/sys/common/upload",
|
|
|
|
|
+ filePath: res.tempFilePaths[0],
|
|
|
|
|
+ name: "file",
|
|
|
|
|
+ formData: { biz: "temp" },
|
|
|
|
|
+ success: (files) => {
|
|
|
|
|
+ let data = JSON.parse(files.data);
|
|
|
|
|
+ if (data.success) {
|
|
|
|
|
+ const imgUrl = configService.apiUrl + "/" + data.message;
|
|
|
|
|
+ this.form.photo = this.form.photo.length ? [...this.form.photo, imgUrl] : [imgUrl];
|
|
|
|
|
+ }
|
|
|
|
|
+ },
|
|
|
|
|
+ });
|
|
|
},
|
|
},
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
|
ViewImage(e) {
|
|
ViewImage(e) {
|
|
|
- uni.previewImage({
|
|
|
|
|
- urls: this.form.photo,
|
|
|
|
|
- current: e.currentTarget.dataset.url,
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ uni.previewImage({ urls: this.form.photo, current: e.currentTarget.dataset.url });
|
|
|
},
|
|
},
|
|
|
chooseVideo() {
|
|
chooseVideo() {
|
|
|
- // 上传视频
|
|
|
|
|
- console.log("上传视频");
|
|
|
|
|
uni.chooseVideo({
|
|
uni.chooseVideo({
|
|
|
sourceType: ["camera", "album"],
|
|
sourceType: ["camera", "album"],
|
|
|
- success: (res) => {
|
|
|
|
|
- this.video = res.tempFilePath;
|
|
|
|
|
- },
|
|
|
|
|
|
|
+ success: (res) => { this.video = res.tempFilePath; },
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
|
sumbit() {
|
|
sumbit() {
|
|
|
if (!this.savedLocation.lng || !this.savedLocation.lat) {
|
|
if (!this.savedLocation.lng || !this.savedLocation.lat) {
|
|
|
- uni.showToast({
|
|
|
|
|
- title: "请先获取位置信息",
|
|
|
|
|
- icon: "none"
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ uni.showToast({ title: "请先获取位置信息", icon: "none" });
|
|
|
return;
|
|
return;
|
|
|
- }
|
|
|
|
|
|
|
+ }
|
|
|
let data = {
|
|
let data = {
|
|
|
id: uni.getStorageSync(USER_INFO).merchantId,
|
|
id: uni.getStorageSync(USER_INFO).merchantId,
|
|
|
storeExtent: this.form.storeExtent,
|
|
storeExtent: this.form.storeExtent,
|
|
@@ -358,77 +259,48 @@
|
|
|
latitude: this.savedLocation.lat,
|
|
latitude: this.savedLocation.lat,
|
|
|
openingTime: this.date,
|
|
openingTime: this.date,
|
|
|
};
|
|
};
|
|
|
- console.log(this.savedLocation.lng)
|
|
|
|
|
- // if (this.form.videoStatus == null) {
|
|
|
|
|
- // this.$http.post('/merchant/LocalMerchantOperate/add', data).then(res => {
|
|
|
|
|
- // if (res.data.success) {
|
|
|
|
|
- // this.$tip.success(res.data.result || '成功')
|
|
|
|
|
- // uni.navigateBack({
|
|
|
|
|
- // delta: 1 // 返回的页面数,默认为1
|
|
|
|
|
- // })
|
|
|
|
|
- // } else {
|
|
|
|
|
- // this.$tip.error(res.data.message);
|
|
|
|
|
- // }
|
|
|
|
|
- // })
|
|
|
|
|
- // }else {
|
|
|
|
|
-
|
|
|
|
|
this.$http
|
|
this.$http
|
|
|
- .post("/merchant/localMerchantInfo/shopEdit", {
|
|
|
|
|
- ...data,
|
|
|
|
|
- })
|
|
|
|
|
|
|
+ .post("/merchant/localMerchantInfo/shopEdit", { ...data })
|
|
|
.then((res) => {
|
|
.then((res) => {
|
|
|
if (res.data.success) {
|
|
if (res.data.success) {
|
|
|
- this.$tip.success(res.data.result || "成功");
|
|
|
|
|
- uni.navigateTo({
|
|
|
|
|
- url: '/pages/store/settings'
|
|
|
|
|
- })
|
|
|
|
|
|
|
+ uni.showToast({ title: '提交成功', icon: 'none' });
|
|
|
|
|
+ uni.navigateTo({ url: '/pages/store/settings' });
|
|
|
} else {
|
|
} else {
|
|
|
- this.$tip.error(res.data.message);
|
|
|
|
|
|
|
+ uni.showToast({ title: res.data.message, icon: 'none' });
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
- // }
|
|
|
|
|
},
|
|
},
|
|
|
delClick(val) {
|
|
delClick(val) {
|
|
|
this.$http
|
|
this.$http
|
|
|
.delete("/merchant/localMerchantTime/delete?id=" + val.id)
|
|
.delete("/merchant/localMerchantTime/delete?id=" + val.id)
|
|
|
.then((res) => {
|
|
.then((res) => {
|
|
|
if (res.data.success) {
|
|
if (res.data.success) {
|
|
|
- this.$tip.success(res.data.result || "成功");
|
|
|
|
|
|
|
+ uni.showToast({ title: '提交成功', icon: 'none' });
|
|
|
this.$http
|
|
this.$http
|
|
|
- .get(
|
|
|
|
|
- "/merchant/localMerchantTime/list?merchantId=" +
|
|
|
|
|
- uni.getStorageSync(USER_INFO).merchantId
|
|
|
|
|
- )
|
|
|
|
|
|
|
+ .get("/merchant/localMerchantTime/list?merchantId=" + uni.getStorageSync(USER_INFO).merchantId)
|
|
|
.then((res) => {
|
|
.then((res) => {
|
|
|
- if (res.data.success) {
|
|
|
|
|
- this.businessData = res.data.result;
|
|
|
|
|
- } else {
|
|
|
|
|
- this.$tip.error(res.data.message);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ if (res.data.success) this.businessData = res.data.result;
|
|
|
|
|
+ else uni.showToast({ icon:'none', title:res.data.message });
|
|
|
});
|
|
});
|
|
|
} else {
|
|
} else {
|
|
|
- this.$tip.error(res.data.message);
|
|
|
|
|
|
|
+ uni.showToast({ icon:'none', title:res.data.message });
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|
|
|
};
|
|
};
|
|
|
</script>
|
|
</script>
|
|
|
-<style scoped lang="scss">
|
|
|
|
|
- page {
|
|
|
|
|
- background: #f8f8fa;
|
|
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
|
|
+<style scoped lang="scss">
|
|
|
|
|
+ page { background: #f8f8fa; }
|
|
|
.top {
|
|
.top {
|
|
|
width: 100%;
|
|
width: 100%;
|
|
|
height: var(--status-bar-height);
|
|
height: var(--status-bar-height);
|
|
|
background: linear-gradient(87deg, #FFFFFF 0%, #A3CDFF 100%), linear-gradient(360deg, #FFFFFF 0%, rgba(255, 255, 255, 0) 100%);
|
|
background: linear-gradient(87deg, #FFFFFF 0%, #A3CDFF 100%), linear-gradient(360deg, #FFFFFF 0%, rgba(255, 255, 255, 0) 100%);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
.head {
|
|
.head {
|
|
|
width: 100%;
|
|
width: 100%;
|
|
|
background: #ffffff;
|
|
background: #ffffff;
|
|
|
-
|
|
|
|
|
.handle {
|
|
.handle {
|
|
|
height: 112rpx;
|
|
height: 112rpx;
|
|
|
display: flex;
|
|
display: flex;
|
|
@@ -436,11 +308,7 @@
|
|
|
align-items: center;
|
|
align-items: center;
|
|
|
padding: 0px 24rpx;
|
|
padding: 0px 24rpx;
|
|
|
position: relative;
|
|
position: relative;
|
|
|
-
|
|
|
|
|
- .head_left {
|
|
|
|
|
- font-size: 40rpx;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
|
|
+ .head_left { font-size: 40rpx; }
|
|
|
.center {
|
|
.center {
|
|
|
position: absolute;
|
|
position: absolute;
|
|
|
left: 50%;
|
|
left: 50%;
|
|
@@ -449,12 +317,10 @@
|
|
|
font-size: 30rpx;
|
|
font-size: 30rpx;
|
|
|
font-weight: 600;
|
|
font-weight: 600;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
.head_right {
|
|
.head_right {
|
|
|
display: flex;
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
justify-content: space-between;
|
|
|
align-items: center;
|
|
align-items: center;
|
|
|
-
|
|
|
|
|
span {
|
|
span {
|
|
|
width: 40rpx;
|
|
width: 40rpx;
|
|
|
height: 40rpx;
|
|
height: 40rpx;
|
|
@@ -465,101 +331,47 @@
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
- .tab-top {
|
|
|
|
|
- padding: 0 26upx;
|
|
|
|
|
- padding-bottom: 130upx;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
|
|
+ .tab-top { padding: 0 26upx; padding-bottom: 130upx; }
|
|
|
.progress-status {
|
|
.progress-status {
|
|
|
position: fixed;
|
|
position: fixed;
|
|
|
width: 100%;
|
|
width: 100%;
|
|
|
z-index: 9999;
|
|
z-index: 9999;
|
|
|
background: #ffffff;
|
|
background: #ffffff;
|
|
|
-
|
|
|
|
|
.status {
|
|
.status {
|
|
|
font-size: 38upx;
|
|
font-size: 38upx;
|
|
|
color: #f6863e;
|
|
color: #f6863e;
|
|
|
font-weight: 500;
|
|
font-weight: 500;
|
|
|
margin-bottom: 10upx;
|
|
margin-bottom: 10upx;
|
|
|
-
|
|
|
|
|
- text {
|
|
|
|
|
- margin-left: 5upx;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- image {
|
|
|
|
|
- vertical-align: text-top;
|
|
|
|
|
- width: 42upx;
|
|
|
|
|
- height: 42upx;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ text { margin-left: 5upx; }
|
|
|
|
|
+ image { vertical-align: text-top; width: 42upx; height: 42upx; }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
.borderRadiu {
|
|
.borderRadiu {
|
|
|
border-radius: 8px;
|
|
border-radius: 8px;
|
|
|
background-color: #ffffff;
|
|
background-color: #ffffff;
|
|
|
-
|
|
|
|
|
.customize {
|
|
.customize {
|
|
|
padding: 0 18upx 18upx;
|
|
padding: 0 18upx 18upx;
|
|
|
-
|
|
|
|
|
- .title {
|
|
|
|
|
- padding: 18upx 0;
|
|
|
|
|
- font-size: 28upx;
|
|
|
|
|
- // padding: 10px;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ .title { padding: 18upx 0; font-size: 28upx; }
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
.business-img {
|
|
.business-img {
|
|
|
height: 210upx;
|
|
height: 210upx;
|
|
|
width: 310upx;
|
|
width: 310upx;
|
|
|
background-size: cover;
|
|
background-size: cover;
|
|
|
-
|
|
|
|
|
- image {
|
|
|
|
|
- width: 100%;
|
|
|
|
|
- height: 100%;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ image { width: 100%; height: 100%; }
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
.business-prompt {
|
|
.business-prompt {
|
|
|
padding-top: 16upx;
|
|
padding-top: 16upx;
|
|
|
font-size: 20upx;
|
|
font-size: 20upx;
|
|
|
color: #999999;
|
|
color: #999999;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
.booder-top {
|
|
.booder-top {
|
|
|
border-bottom: 1px solid rgb(238, 238, 238);
|
|
border-bottom: 1px solid rgb(238, 238, 238);
|
|
|
padding-bottom: 7px;
|
|
padding-bottom: 7px;
|
|
|
-
|
|
|
|
|
- .uploader_video {
|
|
|
|
|
- width: 310upx;
|
|
|
|
|
- height: 210upx;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- .video-container {
|
|
|
|
|
- max-width: 100%;
|
|
|
|
|
- /* 最大宽度为父容器宽度 */
|
|
|
|
|
- max-height: 100%;
|
|
|
|
|
-
|
|
|
|
|
- ::v-deep.uni-video-bar {
|
|
|
|
|
- height: 62upx;
|
|
|
|
|
- padding: 0;
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- // ::v-deep video{
|
|
|
|
|
- // position: relative;
|
|
|
|
|
- // z-index: 1;
|
|
|
|
|
- // width: 310upx ;
|
|
|
|
|
- // height: 210upx;
|
|
|
|
|
- // .uni-video-bar .uni-video-bar-full{
|
|
|
|
|
-
|
|
|
|
|
- // }
|
|
|
|
|
- // }
|
|
|
|
|
|
|
+ .uploader_video { width: 310upx; height: 210upx; }
|
|
|
|
|
+ .video-container { max-width: 100%; max-height: 100%; }
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
.sub-bottom {
|
|
.sub-bottom {
|
|
|
position: fixed;
|
|
position: fixed;
|
|
|
width: 100%;
|
|
width: 100%;
|
|
@@ -567,31 +379,22 @@
|
|
|
background: #ffffff;
|
|
background: #ffffff;
|
|
|
border-top: 1px solid #eeeeee;
|
|
border-top: 1px solid #eeeeee;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
- .uni-uploader__img {
|
|
|
|
|
- width: 200upx;
|
|
|
|
|
- height: 200upx;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- .uni-uploader__file,
|
|
|
|
|
- .uploader_video {
|
|
|
|
|
|
|
+ .uni-uploader__img { width: 200upx; height: 200upx; }
|
|
|
|
|
+ .uni-uploader__file, .uploader_video {
|
|
|
position: relative;
|
|
position: relative;
|
|
|
z-index: 1;
|
|
z-index: 1;
|
|
|
width: 200upx;
|
|
width: 200upx;
|
|
|
height: 200upx;
|
|
height: 200upx;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
.icon-cuo {
|
|
.icon-cuo {
|
|
|
position: absolute;
|
|
position: absolute;
|
|
|
right: 0;
|
|
right: 0;
|
|
|
top: 5upx;
|
|
top: 5upx;
|
|
|
-
|
|
|
|
|
color: #ffffff;
|
|
color: #ffffff;
|
|
|
z-index: 999;
|
|
z-index: 999;
|
|
|
border-top-right-radius: 20upx;
|
|
border-top-right-radius: 20upx;
|
|
|
border-bottom-left-radius: 20upx;
|
|
border-bottom-left-radius: 20upx;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
.business-hours {
|
|
.business-hours {
|
|
|
padding: 27upx 22upx;
|
|
padding: 27upx 22upx;
|
|
|
background: #f7f8fc;
|
|
background: #f7f8fc;
|
|
@@ -599,9 +402,7 @@
|
|
|
border-radius: 8px 8px 8px 8px;
|
|
border-radius: 8px 8px 8px 8px;
|
|
|
margin-bottom: 18upx;
|
|
margin-bottom: 18upx;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
.del-style {
|
|
.del-style {
|
|
|
- // padding: 0 30upx;
|
|
|
|
|
width: 116upx;
|
|
width: 116upx;
|
|
|
background: #ffffff;
|
|
background: #ffffff;
|
|
|
border-radius: 4px 4px 4px 4px;
|
|
border-radius: 4px 4px 4px 4px;
|
|
@@ -610,15 +411,8 @@
|
|
|
font-size: 26upx;
|
|
font-size: 26upx;
|
|
|
line-height: 50upx;
|
|
line-height: 50upx;
|
|
|
text-align: center;
|
|
text-align: center;
|
|
|
- // -radius: 4px 4px 4px 4px;
|
|
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
- .business-date {
|
|
|
|
|
- text {
|
|
|
|
|
- margin-right: 22upx;
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
|
|
+ .business-date { text { margin-right: 22upx; } }
|
|
|
.data-item {
|
|
.data-item {
|
|
|
display: flex;
|
|
display: flex;
|
|
|
align-items: center;
|
|
align-items: center;
|
|
@@ -626,9 +420,6 @@
|
|
|
padding-left: 16rpx;
|
|
padding-left: 16rpx;
|
|
|
height: 80rpx;
|
|
height: 80rpx;
|
|
|
align-items: center;
|
|
align-items: center;
|
|
|
-
|
|
|
|
|
- .custom-input {
|
|
|
|
|
- width: 160rpx;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ .custom-input { width: 160rpx; }
|
|
|
}
|
|
}
|
|
|
</style>
|
|
</style>
|