ui修改
This commit is contained in:
parent
55a995a76c
commit
26c9142d3a
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name" : "核心商城系统",
|
||||
"appid" : "__UNI__EAACF14",
|
||||
"appid" : "__UNI__353D3E6",
|
||||
"description" : "核心商城系统(CoreShop)是基于uni-app框架开发的商城应用程序",
|
||||
"versionName" : "1.0",
|
||||
"versionCode" : 1,
|
||||
|
|
@ -8,7 +8,6 @@
|
|||
"app-plus" : {
|
||||
/* 5+App特有相关 */
|
||||
"modules" : {
|
||||
"Payment" : {},
|
||||
"VideoPlayer" : {}
|
||||
},
|
||||
/* 模块配置 */
|
||||
|
|
@ -32,7 +31,7 @@
|
|||
"<uses-permission android:name=\"android.permission.INTERNET\"/>",
|
||||
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
|
||||
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
|
||||
"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
|
||||
"",
|
||||
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
|
||||
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
|
||||
|
|
@ -44,22 +43,15 @@
|
|||
],
|
||||
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
|
||||
},
|
||||
"ios" : {},
|
||||
"ios" : {
|
||||
"dSYMs" : false
|
||||
},
|
||||
/* ios打包配置 */
|
||||
"sdkConfigs" : {
|
||||
"payment" : {
|
||||
"weixin" : {
|
||||
"appid" : "wxd56f71964a318e5d"
|
||||
},
|
||||
"alipay" : {
|
||||
"scheme" : ""
|
||||
}
|
||||
},
|
||||
"payment" : {},
|
||||
"ad" : {},
|
||||
"maps" : {},
|
||||
"oauth" : {
|
||||
"univerify" : {}
|
||||
}
|
||||
"oauth" : {}
|
||||
},
|
||||
"icons" : {
|
||||
"android" : {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<template>
|
||||
<template>
|
||||
<view class="wrap">
|
||||
<u-toast ref="uToast" /><u-no-network></u-no-network>
|
||||
<u-navbar :is-back="false" :background="background">
|
||||
|
|
@ -62,7 +62,7 @@
|
|||
<u-checkbox @change="itemChangeAll" v-model="selectAll" active-color="red">{{selectText}}</u-checkbox>
|
||||
</view>
|
||||
<view class="cart-shoppingcard-count cart-nowrap cart-flex-vcenter">
|
||||
<text class="cart-text">合计 :</text>
|
||||
<text class="u-font-22">合计 :</text>
|
||||
<text class="u-font-26 coreshop-text-red">{{totalprice}}结缘</text>
|
||||
</view>
|
||||
<view class="cart-shoppingcard-checkout cart-coreshop-bg-red" @tap="checkout">确定</view>
|
||||
|
|
|
|||
|
|
@ -342,7 +342,7 @@
|
|||
basics: 0,
|
||||
basicsList: [
|
||||
{ name: '下单' },
|
||||
{ name: '付款' },
|
||||
{ name: '结算' },
|
||||
{ name: '发货' },
|
||||
{ name: '收货' },
|
||||
{ name: '评价' }
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="u-font-sm u-text-center u-margin-top-30" v-if="basics == 1">
|
||||
<view class="coreshop-text-black">支付成功,待卖家发货.</view>
|
||||
<view class="coreshop-text-black">结算成功,待发货.</view>
|
||||
</view>
|
||||
<view class="u-font-sm u-text-center u-margin-top-30" v-if="basics == 2">
|
||||
<view class="coreshop-text-black">已发货,快递正在路上,务必在收到商品后再确认收货。</view>
|
||||
|
|
@ -187,7 +187,7 @@
|
|||
<u-tag :text="v.name" type="success" size="mini" shape="circle" v-for="(v, k) in item.promotionList" :key="k" />
|
||||
</view>
|
||||
<view class="u-flex u-row-between coreshop-order-priceBox">
|
||||
<view class="coreshop-text-red coreshop-text-price u-font-lg">{{ item.price }}</view>
|
||||
<view class="coreshop-text-red coreshop-text-price u-font-lg">{{ item.price }}结缘</view>
|
||||
<view class="coreshop-text-black u-font-sm coreshop-order-nums">数量:{{ item.nums }}</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -235,16 +235,16 @@
|
|||
<view class="coreshop-text-black title-view">
|
||||
<view class="title">商品总额</view>
|
||||
<view class="u-text-right">
|
||||
<text class="coreshop-text-price">{{ orderInfo.goodsAmount}}</text>
|
||||
<text class="coreshop-text-price">{{ orderInfo.goodsAmount}}结缘</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="coreshop-text-black title-view">
|
||||
<!-- <view class="coreshop-text-black title-view">
|
||||
<view class="title">运费</view>
|
||||
<view class="u-text-right">
|
||||
<text class="u-margin-right-20">+</text>
|
||||
<text class="coreshop-text-price">{{ orderInfo.costFreight}}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="coreshop-text-black title-view" v-if="orderInfo.goodsDiscountAmount > 0">
|
||||
<view class="title">商品优惠</view>
|
||||
<view class="u-text-right">
|
||||
|
|
@ -286,8 +286,8 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="coreshop-text-black coreshop-text-bold title-right-view">
|
||||
<text class="u-margin-right-20">应付款:</text>
|
||||
<text class="coreshop-text-price">{{ orderInfo.orderAmount}}</text>
|
||||
<text class="u-margin-right-20">应付:</text>
|
||||
<text class="coreshop-text-price">{{ orderInfo.orderAmount}}结缘</text>
|
||||
</view>
|
||||
|
||||
<u-line color="#eee" border-style="dashed" margin="20rpx 0" />
|
||||
|
|
@ -361,7 +361,7 @@
|
|||
<view class="coreshop-bg-white coreshop-card-hight-box" />
|
||||
|
||||
<!--为您推荐-->
|
||||
<view class="coreshop-recommended-title-view" v-if="otherData.length>0">
|
||||
<!-- <view class="coreshop-recommended-title-view" v-if="otherData.length>0">
|
||||
<view class="u-flex u-flex-wrap">
|
||||
<view class="u-flex-4 u-text-right">
|
||||
<image class="img-anc" src="/static/images/common/anc.png" mode="widthFix" />
|
||||
|
|
@ -373,15 +373,15 @@
|
|||
<image class="img-anc" src="/static/images/common/anc.png" mode="widthFix" />
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
|
||||
<!--推荐列表-->
|
||||
<view class="coreshop-goods-group" v-if="otherData.length>0">
|
||||
<!-- <view class="coreshop-goods-group" v-if="otherData.length>0">
|
||||
<u-grid col="2" :border="false" :align="center">
|
||||
<u-grid-item bg-color="transparent" :custom-style="{padding: '0rpx'}" v-for="(item, index) in otherData" :key="index" @click="goGoodsDetail(item.id)">
|
||||
<view class="good_box">
|
||||
<view class="good_box"> -->
|
||||
<!-- 警告:微信小程序中需要hx2.8.11版本才支持在template中结合其他组件,比如下方的lazy-load组件 -->
|
||||
<u-lazy-load threshold="-150" border-radius="10" :image="item.image" :index="index"></u-lazy-load>
|
||||
<!-- <u-lazy-load threshold="-150" border-radius="10" :image="item.image" :index="index"></u-lazy-load>
|
||||
<view class="good_title u-line-2">
|
||||
{{item.name}}
|
||||
</view>
|
||||
|
|
@ -397,7 +397,7 @@
|
|||
</view>
|
||||
</u-grid-item>
|
||||
</u-grid>
|
||||
</view>
|
||||
</view> -->
|
||||
|
||||
|
||||
<!--底部-->
|
||||
|
|
@ -421,7 +421,7 @@
|
|||
mixins: [orders, goods, tools],
|
||||
data() {
|
||||
return {
|
||||
numList: [{ name: '下单' }, { name: '付款' }, { name: '发货' }, { name: '收货' }, { name: '评价' }],
|
||||
numList: [{ name: '下单' }, { name: '结算' }, { name: '发货' }, { name: '收货' }, { name: '评价' }],
|
||||
basics: 0,
|
||||
delivery: {},//发货信息
|
||||
orderId: 0,
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
</view>
|
||||
<view class="content">
|
||||
<view class="coreshop-text-grey">{{ item.name }}</view>
|
||||
<view class="coreshop-text-gray u-font-sm flex u-text-left">
|
||||
<!-- <view class="coreshop-text-gray u-font-sm flex u-text-left">
|
||||
<view class="u-line-1">
|
||||
{{ item.memo }}
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
<view class="action">
|
||||
<u-tag text="选择此支付方式" mode="dark" type="error" shape="circle" />
|
||||
<u-tag text="选择此结算方式" mode="dark" type="error" shape="circle" />
|
||||
</view>
|
||||
</view>
|
||||
</button>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<template>
|
||||
<view>
|
||||
<u-toast ref="uToast" /><u-no-network></u-no-network>
|
||||
<u-navbar title="支付"></u-navbar>
|
||||
<u-navbar title="结缘"></u-navbar>
|
||||
<view class="coreshop-bg-white coreshop-solid-bottom u-padding-30">
|
||||
<u-icon name="error-circle" size="28" class="coreshop-text-orange" label="支付信息"></u-icon>
|
||||
<u-icon name="error-circle" size="28" class="coreshop-text-orange" label="结缘信息"></u-icon>
|
||||
</view>
|
||||
<!--商品信息-->
|
||||
<view class="coreshop-list menu">
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
<text class="coreshop-text-grey">订单类型</text>
|
||||
</view>
|
||||
<view class="action">
|
||||
<text class="u-font-sm coreshop-text-gray" v-if="type == 1">商品订单</text>
|
||||
<text class="u-font-sm coreshop-text-gray" v-if="type == 1">结缘订单</text>
|
||||
<text class="u-font-sm coreshop-text-gray" v-if="type == 2" @click="toRecharge()">充值订单</text>
|
||||
<text class="u-font-sm coreshop-text-gray" v-if="type == 3">表单订单</text>
|
||||
<text class="u-font-sm coreshop-text-gray" v-if="type == 4">付款码</text>
|
||||
|
|
@ -30,10 +30,10 @@
|
|||
</view>
|
||||
<view class="coreshop-list-item">
|
||||
<view class="content">
|
||||
<text class="coreshop-text-grey">订单金额</text>
|
||||
<text class="coreshop-text-grey">结缘值</text>
|
||||
</view>
|
||||
<view class="action">
|
||||
<text class="coreshop-text-price coreshop-text-red u-font-lg">{{ orderInfo.money || '' }}</text>
|
||||
<text class="coreshop-text-price coreshop-text-red u-font-lg">{{ orderInfo.money || '' }}结缘</text>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
</view>
|
||||
|
||||
<view class="coreshop-bg-white coreshop-solid-bottom u-padding-30 u-margin-top-30">
|
||||
<u-icon name="checkmark-circle" size="28" class="coreshop-text-orange" label="请点击选择以下支付方式"></u-icon>
|
||||
<u-icon name="checkmark-circle" size="28" class="coreshop-text-orange" label="请点击选择以下结算方式"></u-icon>
|
||||
</view>
|
||||
|
||||
<!--支付方式-->
|
||||
|
|
@ -88,9 +88,9 @@
|
|||
</view>
|
||||
|
||||
<!--提示信息-->
|
||||
<view class="coreshop-text-gray u-padding-20 u-font-sm">
|
||||
<!-- <view class="coreshop-text-gray u-padding-20 u-font-sm">
|
||||
注:如果您在支付中选择的支付方式不适合或异常,请再次选择其他支付方式。
|
||||
</view>
|
||||
</view> -->
|
||||
<!-- 登录提示 -->
|
||||
<coreshop-login-modal></coreshop-login-modal>
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<view>
|
||||
<u-toast ref="uToast" /><u-no-network></u-no-network>
|
||||
<u-navbar title="支付结果"></u-navbar>
|
||||
<u-navbar title="结算结果"></u-navbar>
|
||||
|
||||
<!--状态图标-->
|
||||
<view class="coreshop-status-view">
|
||||
|
|
@ -12,16 +12,16 @@
|
|||
</view>
|
||||
</view>
|
||||
<!--状态标题-->
|
||||
<view class="coreshop-text-bold coreshop-text-black u-font-xl u-text-center" v-if="status && paymentInfo.status === 2">支付成功</view>
|
||||
<view class="coreshop-text-bold coreshop-text-black u-font-xl u-text-center" v-else-if="status && paymentInfo.status === 1">支付失败</view>
|
||||
<view class="coreshop-text-bold coreshop-text-black u-font-xl u-text-center" v-if="status && paymentInfo.status === 2">结算成功</view>
|
||||
<view class="coreshop-text-bold coreshop-text-black u-font-xl u-text-center" v-else-if="status && paymentInfo.status === 1">结算失败</view>
|
||||
|
||||
|
||||
<!--支付金额-->
|
||||
<view class="coreshop-text-bold coreshop-text-black u-font-xl u-text-center chsop-pay-result-price">¥{{ paymentInfo.money || '' }}</view>
|
||||
<view class="coreshop-text-bold coreshop-text-black u-font-xl u-text-center chsop-pay-result-price">{{ paymentInfo.money || '' }}结缘</view>
|
||||
|
||||
<!--状态说明-->
|
||||
<view class="coreshop-text-gray u-font-sm u-text-center coreshop-padding" v-if="status && paymentInfo.status === 2"> 平台已收到您的钱款,已通知卖家发货。平台会及时通知您的交易状态,请您关注。 </view>
|
||||
<view class="coreshop-text-gray u-font-sm u-text-center coreshop-padding" v-else-if="status && paymentInfo.status === 1"> 因为某些问题导致支付失败,请查看详情了解具体问题 </view>
|
||||
<!-- <view class="coreshop-text-gray u-font-sm u-text-center coreshop-padding" v-if="status && paymentInfo.status === 2"> 平台已收到您的钱款,已通知卖家发货。平台会及时通知您的交易状态,请您关注。 </view>
|
||||
<view class="coreshop-text-gray u-font-sm u-text-center coreshop-padding" v-else-if="status && paymentInfo.status === 1"> 因为某些问题导致结算失败,请查看详情了解具体问题 </view> -->
|
||||
|
||||
<!--按钮-->
|
||||
<view class="coreshop-btn-view">
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user