This commit is contained in:
faiz 2024-04-22 09:54:11 +08:00
parent 4a0c34c295
commit 939e9da8fd
24 changed files with 120 additions and 62 deletions

View File

@ -7,13 +7,14 @@ import util from 'utils/util'
import { HTTP_REQUEST_URL } from '@/config/app'; import { HTTP_REQUEST_URL } from '@/config/app';
import skeleton from './components/skeleton/index.vue' import skeleton from './components/skeleton/index.vue'
import BaseMoney from './components/BaseMoney.vue'; import BaseMoney from './components/BaseMoney.vue';
// import uvUI from '@climblee/uv-ui'
Vue.component('skeleton', skeleton) Vue.component('skeleton', skeleton)
Vue.component('BaseMoney', BaseMoney) Vue.component('BaseMoney', BaseMoney)
Vue.prototype.$util = util; Vue.prototype.$util = util;
Vue.prototype.$Cache = Cache; Vue.prototype.$Cache = Cache;
Vue.prototype.$eventHub = new Vue(); Vue.prototype.$eventHub = new Vue();
Vue.config.productionTip = false Vue.config.productionTip = false
// Vue.use(uvUI);
// #ifdef H5 // #ifdef H5
import { parseQuery } from "./utils"; import { parseQuery } from "./utils";
import Auth from './libs/wechat'; import Auth from './libs/wechat';

View File

@ -165,7 +165,10 @@
}, },
"requiredPrivateInfos" : [ "getLocation", "chooseAddress" ], "requiredPrivateInfos" : [ "getLocation", "chooseAddress" ],
"usingComponents" : true, "usingComponents" : true,
"__usePrivacyCheck__" : true "__usePrivacyCheck__" : true,
"optimization" : {
"subPackages" : true
}
}, },
"mp-alipay" : { "mp-alipay" : {
"usingComponents" : true "usingComponents" : true

35
package-lock.json generated
View File

@ -1,34 +1,11 @@
{ {
"name": "DS",
"lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "lockfileVersion": 1,
"": { "dependencies": {
"dependencies": { "@climblee/uv-ui": {
"@lucky-canvas/uni": "^0.0.13", "version": "1.1.20",
"uni-luck-draw": "^1.3.9" "resolved": "https://registry.npmjs.org/@climblee/uv-ui/-/uv-ui-1.1.20.tgz",
} "integrity": "sha512-jkyesHJsPJkF4Nap9ZmG1/ibKlxXA5M8+ntqKXwwloIsYSYL5SOKb0gyPj17aBOU1PkJpmeiZ8PwnTolhK2/HA=="
},
"node_modules/@lucky-canvas/uni": {
"version": "0.0.13",
"resolved": "https://registry.npmjs.org/@lucky-canvas/uni/-/uni-0.0.13.tgz",
"integrity": "sha512-rtudKkWgGY+Uj+1xvZJqbQ/NMGGvge/os0cypj12EO6RK8ZX0NKVR97SxEsFG7mn96cDn96tCg12MwmYQHkB9g==",
"dependencies": {
"lucky-canvas": "~1.7.19"
}
},
"node_modules/lucky-canvas": {
"version": "1.7.27",
"resolved": "https://registry.npmjs.org/lucky-canvas/-/lucky-canvas-1.7.27.tgz",
"integrity": "sha512-Ftz6qD+863bI7xijBmZg3dw3cNEc7odPr70EZQcGA14y3TgTAzH65HPosOCd6kKUlMwhntBaHMx3onoj9MtJRQ=="
},
"node_modules/uni-luck-draw": {
"version": "1.3.9",
"resolved": "https://registry.npmjs.org/uni-luck-draw/-/uni-luck-draw-1.3.9.tgz",
"integrity": "sha512-n0uUHeHL91lUpeoTYE1b6dWyYCdFfN64wGd0v/x8qyacUVbKGGP+QzdcxniVBmFM8Ycgixvxro0cMY6Hag/mQg==",
"dependencies": {
"lucky-canvas": "^1.5.3"
}
} }
} }
} }

View File

@ -1,5 +1,6 @@
{ {
"dependencies": { "dependencies": {
"@climblee/uv-ui": "^1.1.20",
"@lucky-canvas/uni": "^0.0.13", "@lucky-canvas/uni": "^0.0.13",
"uni-luck-draw": "^1.3.9" "uni-luck-draw": "^1.3.9"
} }

View File

@ -31,13 +31,13 @@
"navigationBarTitleText": "购物车" "navigationBarTitleText": "购物车"
} }
}, },
{ // {
"path": "pages/plant_grass/index", // "path": "pages/plant_grass/index",
"style": { // "style": {
// "navigationStyle": "custom", // // "navigationStyle": "custom",
"navigationBarTitleText": "种草社区" // "navigationBarTitleText": "种草社区"
} // }
}, // },
{ {
"path": "pages/user/index", "path": "pages/user/index",
"style": { "style": {
@ -46,6 +46,7 @@
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
// #ifndef MP
{ {
"path": "pages/small_page/index", "path": "pages/small_page/index",
"style": { "style": {
@ -54,6 +55,7 @@
} }
}, },
// #endif
{ {
"path": "pages/shop_details/index", "path": "pages/shop_details/index",
"style": { "style": {
@ -1346,11 +1348,12 @@
] ]
} }
], ],
"easycom" : { "easycom": {
"custom": { // "autoscan": true,
"^u-(.*)" : "@/uni_modules/uview-ui/components/u-$1/u-$1.vue", "custom": {
"^uv-(.*)" : "@/uni_modules/uv-ui/components/uv-$1/uv-$1.vue" "^u-(.*)" : "@/uni_modules/uview-ui/components/u-$1/u-$1.vue"
} // "^uv-(.*)": "@climblee/uv-ui/components/uv-$1/uv-$1.vue"
}
}, },
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
@ -1386,12 +1389,12 @@
"selectedIconPath": "static/images/2-2.png", "selectedIconPath": "static/images/2-2.png",
"text": "分类" "text": "分类"
}, },
{ // {
"pagePath": "pages/shop/index", // "pagePath": "pages/shop/index",
"iconPath": "static/images/3-1.png", // "iconPath": "static/images/3-1.png",
"selectedIconPath": "static/images/3-2.png", // "selectedIconPath": "static/images/3-2.png",
"text": "商家" // "text": "商家"
}, // },
{ {
"pagePath": "pages/order_addcart/order_addcart", "pagePath": "pages/order_addcart/order_addcart",
"iconPath": "static/images/4-1.png", "iconPath": "static/images/4-1.png",

View File

@ -96,7 +96,8 @@ export default {
data() { data() {
return { return {
shopInfo: { shopInfo: {
swiper_image: [{ img: "/static/images/shop_bg.png" }], // swiper_image: [{ img: "/static/images/shop_bg.png" }],
swiper_image: [],
}, },
week: [ "周一", "周二", "周三", "周四", "周五", "周六","周日"], week: [ "周一", "周二", "周三", "周四", "周五", "周六","周日"],
tabList: [{ name: "商家信息" }], tabList: [{ name: "商家信息" }],

View File

@ -14,7 +14,7 @@
<view class="phone"> <view class="phone">
<view class=""> <view class="">
<text class="head">商户账号</text> <text class="head">商户账号</text>
<text class="content">{{resData.mer_account}}</text> <text class="content">{{resData.mer_name}}</text>
</view> </view>
<text class="cope" @click="copyTBL()">复制</text> <text class="cope" @click="copyTBL()">复制</text>
</view> </view>
@ -50,7 +50,7 @@
}) })
}, },
copyTBL(url) { copyTBL(url) {
let copeData = `登录地址:${this.resData.login_url} 商户账号:${this.resData.mer_account}` let copeData = `登录地址:${this.resData.login_url} 商户账号:${this.resData.mer_name}`
// #ifdef MP || APP-PLUS // #ifdef MP || APP-PLUS
uni.setClipboardData({ uni.setClipboardData({
data: copeData, data: copeData,

View File

@ -447,8 +447,8 @@
let biz=resData.biz; let biz=resData.biz;
uni.setStorageSync('updateShopInfo',resData); uni.setStorageSync('updateShopInfo',resData);
let {shopName,mer_classification,classification,businessAddress,businessAddressDetail,EnterpriseType,EnterpriseName,EnterpriseJoinName,EnterprisePhone,EnterpriseId,EnterpriseRooter,userName,userPhone,userId,userPhoto,isVeteran,isVeteranPhoto,isFlagshipStore,isFlagshipStorePhoto,mer_type,mer_storeType} = this.shopInfo; let {shopName,mer_classification,classification,businessAddress,businessAddressDetail,EnterpriseType,EnterpriseName,EnterpriseJoinName,EnterprisePhone,EnterpriseId,EnterpriseRooter,userName,userPhone,userId,userPhoto,isVeteran,isVeteranPhoto,isFlagshipStore,isFlagshipStorePhoto,mer_type,mer_storeType} = this.shopInfo;
console.log(resData);
mer_classification=this.array[resData.mer_type_id],classification=resData.mer_type_id,mer_storeType=this.storeTypeArr[resData.merchant_category_id]['type_name'],mer_type=resData.merchant_category_id,EnterprisePhone=com.mobile,shopName=resData.mer_name,userPhone=resData.phone,EnterpriseName=com.name,userName=resData.name,mer_type=resData.merchant_category_id,classification=resData.mer_type_id,EnterpriseType=com.type,EnterpriseName=com.name,EnterpriseJoinName=com.contact,EnterpriseId=com.number,userName=com.initiator,userPhone=com.inti_mobile,userId=com.inti_number,userPhoto=com.init_image,isVeteran=com.is_huimei,isVeteranPhoto=com.image_huimei,isFlagshipStore=com.is_soldier,isFlagshipStorePhoto=com.image_soldier,businessAddress=biz.province+'/'+biz.city,businessAddressDetail=biz.address_true; mer_classification=this.array[resData.mer_type_id],classification=resData.mer_type_id,mer_storeType=this.storeTypeArr[resData.merchant_category_id]['type_name'],mer_type=resData.mer_type_id,EnterprisePhone=com.mobile,shopName=resData.mer_name,userPhone=resData.phone,EnterpriseName=com.name,userName=resData.name,mer_type=resData.mer_type_id,classification=resData.mer_type_id,EnterpriseType=com.type,EnterpriseName=com.name,EnterpriseJoinName=com.contact,EnterpriseId=com.number,userName=com.initiator,userPhone=com.inti_mobile,userId=com.inti_number,userPhoto=com.init_image,isVeteran=com.is_huimei,isVeteranPhoto=com.image_huimei,isFlagshipStore=com.is_soldier,isFlagshipStorePhoto=com.image_soldier,businessAddress=biz.province+'/'+biz.city,businessAddressDetail=biz.address_true;
this.shopInfo={ this.shopInfo={
shopName,mer_classification,classification,businessAddress,businessAddressDetail,EnterpriseType,EnterpriseName,EnterpriseJoinName,EnterprisePhone,EnterpriseId,EnterpriseRooter,userName,userPhone,userId,userPhoto,isVeteran,isVeteranPhoto,isFlagshipStore,isFlagshipStorePhoto,mer_type,mer_storeType shopName,mer_classification,classification,businessAddress,businessAddressDetail,EnterpriseType,EnterpriseName,EnterpriseJoinName,EnterprisePhone,EnterpriseId,EnterpriseRooter,userName,userPhone,userId,userPhoto,isVeteran,isVeteranPhoto,isFlagshipStore,isFlagshipStorePhoto,mer_type,mer_storeType
} }

View File

@ -82,8 +82,14 @@
<view class="uni-list-cell-db acea-row row-middle"> <view class="uni-list-cell-db acea-row row-middle">
<text class="item-name required">法人身份证有效期开始</text> <text class="item-name required">法人身份证有效期开始</text>
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<!-- <uv-datetime-picker ref="datetimePicker" v-model="shopInfo.idCardStartTime" mode="date" @confirm="validateBtn"></uv-datetime-picker>
<text @click="handleOpen">{{shopInfo.idCardStartTime?shopInfo.idCardStartTim:'请选择日期'}}</text> -->
<input style="text-align: right;" placeholder="请输入" type="text" @input="validateBtn" v-model="shopInfo.idCardStartTime"> <picker mode="date" :value="shopInfo.idCardStartTime" @change="handleOpen">
<view style="font-size: 30rpx;" class="uni-input">{{shopInfo.idCardStartTime}}</view>
</picker>
<!-- <uni-datetime-picker type="date" :clearIcon='false' :border="false" v-model="shopInfo.idCardStartTime" @change="validateBtn" /> -->
<!-- <input style="text-align: right;" placeholder="请输入" type="text" @input="validateBtn" v-model="shopInfo.idCardStartTime"> -->
</view> </view>
</view> </view>
<view class="acea-row row-middle"> <view class="acea-row row-middle">
@ -101,8 +107,10 @@
<view class="uni-list-cell-db acea-row row-middle"> <view class="uni-list-cell-db acea-row row-middle">
<text class="item-name required">法人身份证有效期结束</text> <text class="item-name required">法人身份证有效期结束</text>
<view class="acea-row row-middle" > <view class="acea-row row-middle" >
<picker mode="date" :value="shopInfo.idCardEndTime" @change="handleEndTime">
<input style="text-align: right;" placeholder="请输入" type="text" @input="validateBtn" v-model="shopInfo.idCardEndTime"> <view style="font-size: 30rpx;" class="uni-input">{{shopInfo.idCardEndTime}}</view>
</picker>
<!-- <input style="text-align: right;" placeholder="请输入" type="text" @input="validateBtn" v-model="shopInfo.idCardEndTime"> -->
</view> </view>
</view> </view>
<view class="acea-row row-middle"> <view class="acea-row row-middle">
@ -151,7 +159,11 @@
<view class="item"> <view class="item">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<text class="item-name required">统一社会信用证开始日期</text> <text class="item-name required">统一社会信用证开始日期</text>
<input type="text" style="text-align: right;flex:1;" placeholder="请输入" v-model="shopInfo.countStartTime" @input="validateBtn" placeholder-class='placeholder' />
<picker mode="date" :value="shopInfo.countStartTime" @change="handleCountStartTime">
<view style="font-size: 30rpx;" class="uni-input">{{shopInfo.countStartTime}}</view>
</picker>
<!-- <input type="text" style="text-align: right;flex:1;" placeholder="请输入" v-model="shopInfo.countStartTime" @input="validateBtn" placeholder-class='placeholder' /> -->
</view> </view>
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<text class="tips-text" >请检查格式是否为x年x月x日</text> <text class="tips-text" >请检查格式是否为x年x月x日</text>
@ -163,7 +175,10 @@
<view class="item"> <view class="item">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<text class="item-name required">统一社会信用证截止日期</text> <text class="item-name required">统一社会信用证截止日期</text>
<input type="text" style="text-align: right;flex:1;" placeholder="请输入" v-model="shopInfo.countEndTime" @input="validateBtn" placeholder-class='placeholder' /> <picker mode="date" :value="shopInfo.countEndTime" @change="handleCountEndTime">
<view style="font-size: 30rpx;" class="uni-input">{{shopInfo.countEndTime}}</view>
</picker>
<!-- <input type="text" style="text-align: right;flex:1;" placeholder="请输入" v-model="shopInfo.countEndTime" @input="validateBtn" placeholder-class='placeholder' /> -->
</view> </view>
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<text class="tips-text" >请检查格式是否为x年x月x日</text> <text class="tips-text" >请检查格式是否为x年x月x日</text>
@ -263,7 +278,13 @@
}, },
computed: { computed: {
...mapGetters(['isLogin','viewColor']) ...mapGetters(['isLogin','viewColor']),
// startDate() {
// return this.getDate('start');
// },
// endDate() {
// return this.getDate('end');
// }
}, },
watch:{ watch:{
deep:true, deep:true,
@ -283,6 +304,44 @@
} }
}, },
methods: { methods: {
handleOpen(e){
this.shopInfo.idCardStartTime = this.formatDate(e.detail.value)
this.validateBtn()
},
handleEndTime(e){
this.shopInfo.idCardEndTime = this.formatDate(e.detail.value)
this.validateBtn()
},
handleCountStartTime(e){
this.shopInfo.countStartTime = this.formatDate(e.detail.value)
this.validateBtn()
},
handleCountEndTime(e){
this.shopInfo.countEndTime = this.formatDate(e.detail.value)
this.validateBtn()
},
// getDate(type) {
// const date = new Date();
// let year = date.getFullYear();
// let month = date.getMonth() + 1;
// let day = date.getDate();
// if (type === 'start') {
// year = year - 60;
// } else if (type === 'end') {
// year = year + 2;
// }
// month = month > 9 ? month : '0' + month;
// day = day > 9 ? day : '0' + day;
// return `${year}-${month}-${day}`;
// },
formatDate(dateString) {
const date = new Date(dateString);
const year = date.getFullYear();
const month = (date.getMonth() + 1).toString().padStart(2, '0');
const day = date.getDate().toString().padStart(2, '0');
return `${year}${month}${day}`;
},
isValidDate(dateString) { isValidDate(dateString) {
var regex = /^\d{1,4}年\d{1,2}月\d{1,2}日$/; var regex = /^\d{1,4}年\d{1,2}月\d{1,2}日$/;
return regex.test(dateString); return regex.test(dateString);
@ -351,6 +410,7 @@
this.shopInfo.businessAddress = address.map(v=>v.name).join('/'); this.shopInfo.businessAddress = address.map(v=>v.name).join('/');
}, },
validateBtn(){ validateBtn(){
console.log(this.shopInfo)
let data2=uni.getStorageSync('shopInfo'); let data2=uni.getStorageSync('shopInfo');
let {idCardPhoto,idCardName,idCardNumber,idCardStartTime,idCardEndTime,businessLicense,countId,countStartTime,countEndTime,businessScope,registerAddressDetail}=this.shopInfo; let {idCardPhoto,idCardName,idCardNumber,idCardStartTime,idCardEndTime,businessLicense,countId,countStartTime,countEndTime,businessScope,registerAddressDetail}=this.shopInfo;
if(idCardPhoto&&idCardName&&idCardNumber&&idCardStartTime&&idCardEndTime&&businessLicense&&countId&&countStartTime&&countEndTime&&businessScope&&registerAddressDetail){ if(idCardPhoto&&idCardName&&idCardNumber&&idCardStartTime&&idCardEndTime&&businessLicense&&countId&&countStartTime&&countEndTime&&businessScope&&registerAddressDetail){
@ -498,6 +558,17 @@
background-color: var(--view-theme)!important; background-color: var(--view-theme)!important;
color: #fff!important; color: #fff!important;
} }
/deep/.uni-date-x .icon-calendar{
display: none;
}
/deep/.uni-date__x-input{
text-align: right;
color: #B2B2B2;
}
.uni-input{
font-size: 30rpx;
text-align: right;
}
.uni-input-placeholder { .uni-input-placeholder {
color: #B2B2B2; color: #B2B2B2;
} }

View File

@ -45,7 +45,7 @@
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.14.3", "libVersion": "2.14.3",
"appid": "wx5fb1cc8edb3f8baa", "appid": "wx95e45e4fc390dd98",
"projectname": " _merchant_h5", "projectname": " _merchant_h5",
"simulatorType": "wechat", "simulatorType": "wechat",
"simulatorPluginLibVersion": {}, "simulatorPluginLibVersion": {},

View File

@ -2220,7 +2220,7 @@
content: "\e618"; content: "\e618";
} }
.icon- 1:before { .icon-1:before {
content: "\e739"; content: "\e739";
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 237 KiB

View File

@ -1,4 +1,5 @@
module.exports = { module.exports = {
transpileDependencies: ['@climblee/uv-ui'],
productionSourceMap: false, // 生产打包时不输出map文件增加打包速度 productionSourceMap: false, // 生产打包时不输出map文件增加打包速度
configureWebpack: config => { configureWebpack: config => {
if (process.env.NODE_ENV === 'production') { if (process.env.NODE_ENV === 'production') {