This commit is contained in:
1154079537 2024-05-11 14:23:35 +08:00
parent 895ad285b1
commit e5b880933c
7 changed files with 516 additions and 539 deletions

View File

@ -2,23 +2,20 @@
<view class="contentgb"> <view class="contentgb">
<view class="return_top"> <view class="return_top">
<view class="z-bootm-img1" @click="returnbom()"> <view class="z-bootm-img1" @click="returnbom()">
<image src="@/static/images/fb1.png" mode="aspectFit"></image> <u-image width="40rpx" height="14rpx" src="@/static/images/fb1.png" mode="widthFit"></u-image>
</view> </view>
<view class="z-bootm-l"></view> <view class="z-bootm-l"></view>
<view class="z-bootm-img2" @click="returnbom()"> <view class="z-bootm-img2" @click="returnbom()">
<image src="@/static/images/fb2.png" mode="aspectFit"></image> <u-image width="38rpx" height="38rpx" src="@/static/images/fb2.png" mode="widthFit"></u-image>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {}
}
}, },
methods: { methods: {
returnbom() { returnbom() {
@ -34,58 +31,25 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.contentgb { .contentgb {
width: 166rpx; width: 166rpx;
height: 56rpx; height: 56rpx;
.return_top { .return_top {
display: flex;
justify-content: center;
align-items: center;
width: 166rpx; width: 166rpx;
height: 56rpx; height: 56rpx;
background: rgba(255, 255, 255, 0.6); background: rgba(255, 255, 255, 0.6);
border-radius: 44rpx 44rpx; border-radius: 44rpx 44rpx;
position: relative; position: relative;
.z-bootm-img1 {
width: 41rpx;
height: 13rpx;
position: absolute;
top: 5rpx;
left: 25rpx;
image {
width: 100%;
height: 100%;
}
}
.z-bootm-l { .z-bootm-l {
width: 1px; width: 1px;
height: 32rpx; height: 32rpx;
background: rgba(0, 0, 0, 0.2); background: rgba(0, 0, 0, 0.2);
margin: auto 0; margin: 0 16rpx;
position: absolute;
top: 10rpx;
left: 85rpx;
} }
.z-bootm-img2 {
width: 38rpx;
height: 38rpx;
margin-top: -15rpx;
margin-left: -15rpx;
position: absolute;
right: 25rpx;
top: 25rpx;
image {
width: 100%;
height: 100%;
}
}
} }
} }
</style> </style>

View File

@ -1,52 +1,52 @@
{ {
"name": "惠农商户平台", "name" : "惠农商户平台",
"appid": "__UNI__7626C0F", "appid" : "__UNI__7626C0F",
"description": "", "description" : "",
"versionName": "1.5.0", "versionName" : "1.5.0",
"versionCode": 1500, "versionCode" : 1500,
"transformPx": false, "transformPx" : false,
/* 5+App */ /* 5+App */
"app-plus": { "app-plus" : {
"titleNView": true, "titleNView" : true,
"usingComponents": true, "usingComponents" : true,
"nvueCompiler": "uni-app", "nvueCompiler" : "uni-app",
"nvueStyleCompiler": "uni-app", "nvueStyleCompiler" : "uni-app",
"compilerVersion": 3, "compilerVersion" : 3,
"compatible": { "compatible" : {
"ignoreVersion": true //trueHBuilderX1.9.0 "ignoreVersion" : true //trueHBuilderX1.9.0
}, },
"splashscreen": { "splashscreen" : {
"alwaysShowBeforeRender": true, "alwaysShowBeforeRender" : true,
"waiting": true, "waiting" : true,
"autoclose": true, "autoclose" : true,
"delay": 0 "delay" : 0
}, },
/* */ /* */
"modules": { "modules" : {
"VideoPlayer": {}, "VideoPlayer" : {},
"iBeacon": {}, "iBeacon" : {},
"Barcode": {}, "Barcode" : {},
"Camera": {}, "Camera" : {},
"Geolocation": {}, "Geolocation" : {},
"Payment": {}, "Payment" : {},
"Share": {}, "Share" : {},
"OAuth": {}, "OAuth" : {},
"UniMP": { "UniMP" : {
"description": "uni小程序" "description" : "uni小程序"
}, },
"Maps": {} "Maps" : {}
}, },
"safearea": { "safearea" : {
"bottom": { "bottom" : {
"offset": "none" "offset" : "none"
} }
}, },
/* */ /* */
"distribute": { "distribute" : {
/* android */ /* android */
"android": { "android" : {
"resizeableActivity": true, "resizeableActivity" : true,
"permissions": [ "permissions" : [
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>", "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>", "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>", "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
@ -70,148 +70,149 @@
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>", "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
], ],
"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"], "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
"permissionExternalStorage": { "permissionExternalStorage" : {
"request": "none", "request" : "none",
"prompt": "应用保存运行状态等信息,需要获取读写手机存储(系统提示为访问设备上的照片、媒体内容和文件)权限,请允许。" "prompt" : "应用保存运行状态等信息,需要获取读写手机存储(系统提示为访问设备上的照片、媒体内容和文件)权限,请允许。"
}, },
"permissionPhoneState": { "permissionPhoneState" : {
"request": "none" // "request" : "none" //
} }
}, },
/* ios */ /* ios */
"ios": { "ios" : {
"privacyDescription": { "privacyDescription" : {
"NSPhotoLibraryUsageDescription": "上传用户头像保存分享海报", "NSPhotoLibraryUsageDescription" : "上传用户头像保存分享海报",
"NSPhotoLibraryAddUsageDescription": "上传用户头像保存分享海报", "NSPhotoLibraryAddUsageDescription" : "上传用户头像保存分享海报",
"NSCameraUsageDescription": "上传用户头像保存分享海报", "NSCameraUsageDescription" : "上传用户头像保存分享海报",
"NSLocationWhenInUseUsageDescription": "根据客户地理位置推荐最近门店", "NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店",
"NSLocationAlwaysUsageDescription": "根据客户地理位置推荐最近门店", "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店",
"NSLocationAlwaysAndWhenInUseUsageDescription": "根据客户地理位置推荐最近门店" "NSLocationAlwaysAndWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店"
}, },
"idfa": false, "idfa" : false,
"dSYMs": false "dSYMs" : false
}, },
/* SDK */ /* SDK */
"sdkConfigs": { "sdkConfigs" : {
"maps": { "maps" : {
"amap": { "amap" : {
"appkey_ios": "0a3202688624938fd5d2f37b52c30d5d", "appkey_ios" : "0a3202688624938fd5d2f37b52c30d5d",
"appkey_android": "0354f5ddc11e2ea76c5aac647f44d945", "appkey_android" : "0354f5ddc11e2ea76c5aac647f44d945",
"name": "amapIvoVHpJR" "name" : "amapIvoVHpJR"
} }
}, },
"payment": { "payment" : {
"weixin": { "weixin" : {
"__platform__": ["ios", "android"], "__platform__" : [ "ios", "android" ],
"appid": "wx9d68c92b550ddd1e", "appid" : "wx9d68c92b550ddd1e",
"UniversalLinks": "https://mer.crmeb.net/" "UniversalLinks" : "https://mer.crmeb.net/"
} }
}, },
"share": { "share" : {
"weixin": { "weixin" : {
"appid": "wx9d68c92b550ddd1e", "appid" : "wx9d68c92b550ddd1e",
"UniversalLinks": "https://mer.crmeb.net/" "UniversalLinks" : "https://mer.crmeb.net/"
} }
}, },
"geolocation": { "geolocation" : {
"amap": { "amap" : {
"name": "amapIvoVHpJR", "name" : "amapIvoVHpJR",
"__platform__": ["ios", "android"], "__platform__" : [ "ios", "android" ],
"appkey_ios": "0a3202688624938fd5d2f37b52c30d5d", "appkey_ios" : "0a3202688624938fd5d2f37b52c30d5d",
"appkey_android": "0354f5ddc11e2ea76c5aac647f44d945" "appkey_android" : "0354f5ddc11e2ea76c5aac647f44d945"
}, },
"system": { "system" : {
"__platform__": ["ios", "android"] "__platform__" : [ "ios", "android" ]
} }
}, },
"oauth": {}, "oauth" : {},
"ad": {} "ad" : {}
}, },
"icons": { "icons" : {
"android": { "android" : {
"hdpi": "unpackage/res/icons/72x72.png", "hdpi" : "unpackage/res/icons/72x72.png",
"xhdpi": "unpackage/res/icons/96x96.png", "xhdpi" : "unpackage/res/icons/96x96.png",
"xxhdpi": "unpackage/res/icons/144x144.png", "xxhdpi" : "unpackage/res/icons/144x144.png",
"xxxhdpi": "unpackage/res/icons/192x192.png" "xxxhdpi" : "unpackage/res/icons/192x192.png"
}, },
"ios": { "ios" : {
"appstore": "unpackage/res/icons/1024x1024.png", "appstore" : "unpackage/res/icons/1024x1024.png",
"ipad": { "ipad" : {
"app": "unpackage/res/icons/76x76.png", "app" : "unpackage/res/icons/76x76.png",
"app@2x": "unpackage/res/icons/152x152.png", "app@2x" : "unpackage/res/icons/152x152.png",
"notification": "unpackage/res/icons/20x20.png", "notification" : "unpackage/res/icons/20x20.png",
"notification@2x": "unpackage/res/icons/40x40.png", "notification@2x" : "unpackage/res/icons/40x40.png",
"proapp@2x": "unpackage/res/icons/167x167.png", "proapp@2x" : "unpackage/res/icons/167x167.png",
"settings": "unpackage/res/icons/29x29.png", "settings" : "unpackage/res/icons/29x29.png",
"settings@2x": "unpackage/res/icons/58x58.png", "settings@2x" : "unpackage/res/icons/58x58.png",
"spotlight": "unpackage/res/icons/40x40.png", "spotlight" : "unpackage/res/icons/40x40.png",
"spotlight@2x": "unpackage/res/icons/80x80.png" "spotlight@2x" : "unpackage/res/icons/80x80.png"
}, },
"iphone": { "iphone" : {
"app@2x": "unpackage/res/icons/120x120.png", "app@2x" : "unpackage/res/icons/120x120.png",
"app@3x": "unpackage/res/icons/180x180.png", "app@3x" : "unpackage/res/icons/180x180.png",
"notification@2x": "unpackage/res/icons/40x40.png", "notification@2x" : "unpackage/res/icons/40x40.png",
"notification@3x": "unpackage/res/icons/60x60.png", "notification@3x" : "unpackage/res/icons/60x60.png",
"settings@2x": "unpackage/res/icons/58x58.png", "settings@2x" : "unpackage/res/icons/58x58.png",
"settings@3x": "unpackage/res/icons/87x87.png", "settings@3x" : "unpackage/res/icons/87x87.png",
"spotlight@2x": "unpackage/res/icons/80x80.png", "spotlight@2x" : "unpackage/res/icons/80x80.png",
"spotlight@3x": "unpackage/res/icons/120x120.png" "spotlight@3x" : "unpackage/res/icons/120x120.png"
} }
} }
}, },
"splashscreen": { "splashscreen" : {
"useOriginalMsgbox": true "useOriginalMsgbox" : true
} }
} }
}, },
/* */ /* */
"quickapp": {}, "quickapp" : {},
/* */ /* */
"mp-weixin": { "mp-weixin" : {
"appid": "wxfb4695444ab8d0d0", "appid" : "wxfb4695444ab8d0d0",
"setting": { "setting" : {
"urlCheck": false, "urlCheck" : false,
"minified": true, "minified" : true,
"postcss": true, "postcss" : true,
"es6": true "es6" : true
}, },
"permission": { "permission" : {
"scope.userLocation": { "scope.userLocation" : {
"desc": "获取您的位置" "desc" : "获取您的位置"
} }
}, },
"requiredPrivateInfos": ["getLocation", "chooseAddress"], "requiredPrivateInfos" : [ "getLocation", "chooseAddress" ],
"usingComponents": true "usingComponents" : true
}, },
"mp-alipay": { "mp-alipay" : {
"usingComponents": true "usingComponents" : true
}, },
"mp-baidu": { "mp-baidu" : {
"usingComponents": true "usingComponents" : true
}, },
"mp-toutiao": { "mp-toutiao" : {
"usingComponents": true "usingComponents" : true
}, },
"h5": { "h5" : {
"devServer": { "devServer" : {
"https": false "https" : false
}, },
"router": { "router" : {
"mode": "history", "mode" : "history",
"base": "" "base" : ""
}, },
"domain": "", "domain" : "",
"sdkConfigs": { "sdkConfigs" : {
"maps": { "maps" : {
"qqmap": { "qqmap" : {
"key": "SMJBZ-WCHK4-ZPZUA-DSIXI-XDDVQ-XWFX7" "key" : "SMJBZ-WCHK4-ZPZUA-DSIXI-XDDVQ-XWFX7"
} }
} }
}, },
"title": "加载中...", "title" : "加载中...",
"template": "template.h5.html" "template" : "template.h5.html"
} }
} }
// //
/* ios */ /* ios */

View File

@ -36,7 +36,7 @@
<navigator <navigator
v-if="item.msn_type === 6 && item.refundOrder && item.refundOrder.refund_order_id" v-if="item.msn_type === 6 && item.refundOrder && item.refundOrder.refund_order_id"
open-type="navigate" open-type="navigate"
:url="'/pages/order_details/index?order_id='+item.refundOrder.order_id"> :url="'/pages/admin/refundDetail/index?id='+item.refundOrder.refund_order_id + '&mer_id=' + item.mer_id">
<div class="broadcast-details_num"> <div class="broadcast-details_num">
<span>退款单号{{ item.refundOrder.refund_order_sn }}</span> <span>退款单号{{ item.refundOrder.refund_order_sn }}</span>
</div> </div>

View File

@ -16,7 +16,7 @@
v-if="item.last && (item.last.msn_type == 5 || item.last.msn_type == 6)">[订单]</view> v-if="item.last && (item.last.msn_type == 5 || item.last.msn_type == 6)">[订单]</view>
</view> </view>
<view class="right-box"> <view class="right-box">
<view class="time">{{item.last && item.last.create_time.split(' ')[1] || ''}}</view> <view class="time">{{item.display_time}}</view>
<view class="num" v-if="item.num>0">{{item.num}}</view> <view class="num" v-if="item.num>0">{{item.num}}</view>
</view> </view>
</div> </div>
@ -38,7 +38,7 @@
v-if="item.last && (item.last.msn_type == 5 || item.last.msn_type == 6)">[订单]</view> v-if="item.last && (item.last.msn_type == 5 || item.last.msn_type == 6)">[订单]</view>
</view> </view>
<view class="right-box"> <view class="right-box">
<view class="time">{{item.last && item.last.create_time.split(' ')[1]}}</view> <view class="time">{{item.display_time}}</view>
<view class="num" v-if="item.num>0">{{item.num}}</view> <view class="num" v-if="item.num>0">{{item.num}}</view>
</view> </view>
</div> </div>

View File

@ -1,16 +1,20 @@
<!-- 未开通商户 --> <!-- 未开通商户 -->
<template> <template>
<view class="unregist"> <view class="unregist">
<view class="unregist-wrap">
<view class="icon" @click="handleBack"> <!-- 适配不同机 -->
<u-icon name="arrow-left" color="#fff" size="20"></u-icon> <view style="height: var(--status-bar-height);"></view>
</view> <view style="display: flex;justify-content: space-between;height:100%;">
<view class="head"> <view class="head">
<image src="@/static/images/f.png"></image> <image src="@/static/images/f.png"></image>
<text>暂无信息</text> <text>暂无信息</text>
</view> </view>
<!-- 按钮 -->
<retuntop style="margin-right: 50rpx;margin-top: 20rpx;" />
</view>
</view>
<view class="con"> <view class="con">
<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e70e7202404021040448288.png"></image> <image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e70e7202404021040448288.png"></image>
<text class="empty">暂无数据</text> <text class="empty">暂无数据</text>
@ -24,7 +28,11 @@
</template> </template>
<script> <script>
import retuntop from '@/components/content-top/index.vue';
export default { export default {
components: {
retuntop
},
methods: { methods: {
handleBack() { handleBack() {
console.log(1241) console.log(1241)
@ -52,16 +60,7 @@
.unregist { .unregist {
position: relative; position: relative;
.icon { .unregist-wrap {
position: absolute;
top: calc(30rpx + var(--status-bar-height));
left: 30rpx;
z-index: 10;
}
.head {
display: flex;
align-items: center;
width: 100%; width: 100%;
height: 360rpx; height: 360rpx;
background-image: url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/a2e04202404021019436262.webp); background-image: url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/a2e04202404021019436262.webp);
@ -69,6 +68,11 @@
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
margin-bottom: 200rpx; margin-bottom: 200rpx;
}
.head {
display: flex;
align-items: center;
image { image {
width: 112rpx; width: 112rpx;

View File

@ -7,7 +7,7 @@
<view class="tab-item" :class="{on:tabIndex==2}" @click="tabIndex = 2">商户</view> <view class="tab-item" :class="{on:tabIndex==2}" @click="tabIndex = 2">商户</view>
</view> </view>
<block v-if="tabIndex==1"> <block v-if="tabIndex==1">
<view class='nav acea-row row-middle' > <view class='nav acea-row row-middle'>
<view class='item' @click="downStatus = !downStatus" <view class='item' @click="downStatus = !downStatus"
:class="{'t-color':downKey>0 && firstKey == 0}"> :class="{'t-color':downKey>0 && firstKey == 0}">
{{downMenu[downKey].title}} {{downMenu[downKey].title}}
@ -151,8 +151,7 @@
<passwordPopup></passwordPopup> <passwordPopup></passwordPopup>
<!-- #endif --> <!-- #endif -->
<!-- 购物车 --> <!-- 购物车 -->
<view class="card" :style="`bottom:10px`" <view class="card" :style="`bottom:10px`" @click="navgo('/pages/order_addcart/order_addcart?product_type=98')">
@click="navgo('/pages/order_addcart/order_addcart?product_type=98')">
<view class="left"> <view class="left">
<view class="cart" :class="{ act_cart: false }" style="position: relative; z-index: 9999999"> <view class="cart" :class="{ act_cart: false }" style="position: relative; z-index: 9999999">
<u--image :showLoading="true" src="/static/images/LHYC/GWC.png" width="63.09rpx" <u--image :showLoading="true" src="/static/images/LHYC/GWC.png" width="63.09rpx"
@ -745,7 +744,7 @@
uni.showToast({ uni.showToast({
title: '推荐商品,加载完毕', title: '推荐商品,加载完毕',
duration: 2000, // duration: 2000, //
icon:'none' icon: 'none'
}) })
} }
}); });
@ -864,7 +863,7 @@
this.goodsNum = res.data[0].count this.goodsNum = res.data[0].count
}) })
}, },
navgo(url){ navgo(url) {
uni.navigateTo({ uni.navigateTo({
url: url url: url
}) })
@ -977,7 +976,7 @@
width: 62rpx; width: 62rpx;
font-size: 40rpx; font-size: 40rpx;
height: 86rpx; height: 86rpx;
line-height: 86rpx ; line-height: 86rpx;
} }
.productList .nav-wrapper { .productList .nav-wrapper {
@ -1484,6 +1483,7 @@
justify-content: center; justify-content: center;
color: #fff; color: #fff;
margin: 0 20rpx; margin: 0 20rpx;
// align-self: ;
.zhezhao { .zhezhao {
position: absolute; position: absolute;
@ -1516,7 +1516,8 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
.left{
.left {
flex: 1; flex: 1;
display: flex; display: flex;
// height: 50px; // height: 50px;
@ -1537,9 +1538,10 @@
margin-right: 5px; margin-right: 5px;
} }
} }
.right{
.right {
flex-shrink: 0; flex-shrink: 0;
background: linear-gradient(to right, #ff7b36,#F84221); background: linear-gradient(to right, #ff7b36, #F84221);
color: #fff; color: #fff;
height: 50rpx; height: 50rpx;
line-height: 50rpx; line-height: 50rpx;
@ -1572,6 +1574,7 @@
.text { .text {
flex: 1; flex: 1;
width: 100%; width: 100%;
.text_one { .text_one {
display: flex; display: flex;
height: 30px; height: 30px;
@ -1699,6 +1702,7 @@
.pop { .pop {
z-index: 1; z-index: 1;
} }
.score { .score {
display: flex; display: flex;
align-items: center; align-items: center;
@ -1713,7 +1717,8 @@
margin-right: 15rpx; margin-right: 15rpx;
} }
.score_text{
.score_text {
color: #fd5d2e; color: #fd5d2e;
} }
@ -1739,6 +1744,7 @@
} }
} }
} }
.card { .card {
width: 720rpx; width: 720rpx;
z-index: 99; z-index: 99;
@ -1767,6 +1773,7 @@
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
} }
.badge { .badge {
position: absolute; position: absolute;
top: 0; top: 0;
@ -1790,6 +1797,7 @@
text-align: center; text-align: center;
} }
} }
.act_cart { .act_cart {
transition: 0.5s; transition: 0.5s;
transform: scale(1.1); transform: scale(1.1);

View File

@ -54,7 +54,7 @@
<view class="withdrawal-form-item-label">提现金额</view> <view class="withdrawal-form-item-label">提现金额</view>
<view class="withdrawal-form-item-val"> <view class="withdrawal-form-item-val">
<input @input="onInput" type="number" placeholder="请输入提现金额" <input @input="onInput" type="number" placeholder="请输入提现金额"
placeholder-class="placeholderClass" :value="payForm.extract_money"> placeholder-class="placeholderClass" v-model="payForm.extract_money">
</view> </view>
</view> </view>
</view> </view>