other_project/mallplus
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2023-3-20

Browse Source
This commit is contained in:
guoxing
2023-03-20 17:09:43 +08:00
parent c09649f5d5
commit fd201d9dc9
10 changed files with 65 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mallplusui-uniapp-app/common/api.js
View File

@@ -2,8 +2,8 @@ import store from '../store/index';
export default { export default {
// qq 237524947 wx15d4269d3210863d // qq 237524947 wx15d4269d3210863d
// BASEURI: 'http://je4r5e.natappfree.cc/api/', // BASEURI: 'http://je4r5e.natappfree.cc/api/',
BASEURI: 'http://mall.yyundong.com/portalapi/api/', // BASEURI: 'http://mall.yyundong.com/portalapi/api/',
// BASEURI: 'http://192.168.3.116:8083/api/', BASEURI: 'http://192.168.3.9:8083/api/',
ADMINURI: 'http://mall.yyundong.com/adminapi/', ADMINURI: 'http://mall.yyundong.com/adminapi/',
ESURI: 'http://www.yyundong.com:8081/', ESURI: 'http://www.yyundong.com:8081/',
h5Appid: 'wxb4660f37187c0b8e', // h5微信登录的appId 暂时测试用 h5Appid: 'wxb4660f37187c0b8e', // h5微信登录的appId 暂时测试用

6
mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue
View File

@@ -143,7 +143,7 @@
.coupon-money { .coupon-money {
padding: 15px; padding: 15px;
width: 523upx; width: 73.5%;
height: auto; height: auto;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -211,7 +211,7 @@
width: 40upx; width: 40upx;
height: 20upx; height: 20upx;
position: absolute; position: absolute;
left: 500upx; left: 70%;
top: -1px; top: -1px;
border-radius: 0 0 40upx 40upx; border-radius: 0 0 40upx 40upx;
content: ""; content: "";
@@ -225,7 +225,7 @@
width: 40upx; width: 40upx;
height: 20upx; height: 20upx;
position: absolute; position: absolute;
left: 500upx; left:70%;
bottom: -1px; bottom: -1px;
border-radius: 40upx 40upx 0 0; border-radius: 40upx 40upx 0 0;
content: ""; content: "";

4
mallplusui-uniapp-app/manifest.json
View File

@@ -2,8 +2,8 @@
"name" : "汇融云链", "name" : "汇融云链",
"appid" : "__UNI__FB2C9C4", "appid" : "__UNI__FB2C9C4",
"description" : "", "description" : "",
"versionName" : "1.0.1.3", "versionName" : "1.0.1.4",
"versionCode" : 1013, "versionCode" : 1014,
"transformPx" : false, "transformPx" : false,
"app-plus" : { "app-plus" : {
"usingComponents" : true, "usingComponents" : true,

18
mallplusui-uniapp-app/pages/index/messageList.vue
View File

@@ -79,7 +79,7 @@
setTimeout(function() { setTimeout(function() {
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
}, 2000); }, 2000);
}, },
//加载更多 //加载更多
onReachBottom() { onReachBottom() {
@@ -188,23 +188,19 @@
} }
.listcard-content { .listcard-content {
flex: 1;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding-left: 10px; padding-left: 10px;
width: 100%;
justify-content: space-between;
.listcard-content_title { .listcard-content_title {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; align-items: center;
font-size: 14px;
color: #333;
font-weight: 400;
line-height: 1.2;
position: relative;
text { text {
flex:2.5;
margin-right: 10px;
font-size: 22px; font-size: 22px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@@ -214,9 +210,9 @@
} }
.text2 { .text2 {
flex: 1;
color: #999; color: #999;
margin-right: 10px; font-size: 15px;
font-size: 18px;
} }
} }

15
mallplusui-uniapp-app/pages/index/user.vue
View File

@@ -130,7 +130,7 @@
mode="aspectFill"></image> mode="aspectFill"></image>
</scroll-view> </scroll-view>
<list-cell icon="icon-iconfontweixin" iconColor="#e07472" title="我的订单" <list-cell icon="icon-iconfontweixin" iconColor="#e07472" title="我的订单"
@eventClick="navTo('../../pages/order/order?status=0')" ></list-cell> @eventClick="navTo('../../pages/order/order?status=0')"></list-cell>
<list-cell icon="icon-dizhi" iconColor="#5fcda2" title="地址管理" <list-cell icon="icon-dizhi" iconColor="#5fcda2" title="地址管理"
@eventClick="navTo('../../pagesU/address/address')"></list-cell> @eventClick="navTo('../../pagesU/address/address')"></list-cell>
<list-cell icon="icon-tuandui" iconColor="#EE82EE" title="个人资料" <list-cell icon="icon-tuandui" iconColor="#EE82EE" title="个人资料"
@@ -179,9 +179,9 @@
<list-cell icon="icon-shezhi1" iconColor="#e07472" title="系统设置" border="" <list-cell icon="icon-shezhi1" iconColor="#e07472" title="系统设置" border=""
@eventClick="navTo('/pages/set/set')"></list-cell> @eventClick="navTo('/pages/set/set')"></list-cell>
<!-- <list-cell icon="icon-shezhi1" iconColor="#e07472" title="test" border="" @eventClick="navTo('/pages/search/test')"></list-cell> --> <!-- <list-cell icon="icon-shezhi1" iconColor="#e07472" title="test" border="" @eventClick="navTo('/pages/search/test')"></list-cell> -->
<!-- <view>{{push}}</view> --> <!-- <view>{{push}}</view> -->
</view> </view>
</view> </view>
<neil-modal :show="inputShow" @close="cancel" title="编辑" @cancel="cancel" @confirm="confirm"> <neil-modal :show="inputShow" @close="cancel" title="编辑" @cancel="cancel" @confirm="confirm">
@@ -326,8 +326,13 @@
this.userDetailInfo = data1.member; this.userDetailInfo = data1.member;
uni.setStorageSync('userInfos', data1.member); uni.setStorageSync('userInfos', data1.member);
console.log(this.userDetailInfo); console.log(this.userDetailInfo);
let couponList = data1.histories; data1.histories.forEach(item => {
this.couponList = couponList; if (item.useStatus == 0) {
this.couponList.push(item);
}
});
console.log("couponList>>>>>", this.couponList);
} }
}, },
// 获取浏览历史 // 获取浏览历史

12
mallplusui-uniapp-app/pages/order/createOrder.vue
View File

@@ -38,7 +38,7 @@
<image :src="item.productPic"></image> <image :src="item.productPic"></image>
<view class="right"> <view class="right">
<text class="title clamp">{{ item.productName }}</text> <text class="title clamp">{{ item.productName }}</text>
<text class="spec" v-if="item.productAttr">{{ item.productAttr }}</text> <!-- <text class="spec" v-if="item.productAttr">{{ item.productAttr }}</text> -->
<view class="price-box"> <view class="price-box">
<text class="price">￥{{ item.price }}</text> <text class="price">￥{{ item.price }}</text>
<text class="number">x {{ item.quantity }}</text> <text class="number">x {{ item.quantity }}</text>
@@ -564,8 +564,8 @@
image { image {
flex-shrink: 0; flex-shrink: 0;
display: block; display: block;
width: 140upx; width: 100upx;
height: 140upx; height: 100upx;
border-radius: 4upx; border-radius: 4upx;
} }
@@ -576,7 +576,7 @@
} }
.title { .title {
font-size: 30upx; font-size: 28upx;
color: $font-color-dark; color: $font-color-dark;
} }
@@ -588,9 +588,7 @@
.price-box { .price-box {
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 32upx; padding-top: 10upx;
color: $font-color-dark;
padding-top: 25upx;
.price { .price {
margin-bottom: 4upx; margin-bottom: 4upx;

8
mallplusui-uniapp-app/pages/order/createOrder1.vue
View File

@@ -29,10 +29,10 @@
</view> </view>
<!-- 商品列表 --> <!-- 商品列表 -->
<view class="g-item" v-for="(item, index) in cartPromotionItemList" :key="index"> <view class="g-item" v-for="(item, index) in cartPromotionItemList" :key="index">
<image :src="item.productPic"></image> <image style="width: 50px; height: 50px;" :src="item.productPic"></image>
<view class="right"> <view class="right">
<text class="title clamp">{{ item.productName }}</text> <text class="title clamp">{{ item.productName }}</text>
<text class="spec" v-if="item.productAttr">{{ item.productAttr }}</text> <!-- <text class="spec" v-if="item.productAttr">{{ item.productAttr }}</text> -->
<view class="price-box"> <view class="price-box">
<text class="price">￥{{ item.price }}</text> <text class="price">￥{{ item.price }}</text>
<text class="number">x {{ item.quantity }}</text> <text class="number">x {{ item.quantity }}</text>
@@ -439,7 +439,7 @@ import Api from '@/common/api';
} }
.title { .title {
font-size: 30 upx; font-size: 28 upx;
color: $font-color-dark; color: $font-color-dark;
} }
@@ -451,8 +451,6 @@ import Api from '@/common/api';
.price-box { .price-box {
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 32 upx;
color: $font-color-dark;
padding-top: 10 upx; padding-top: 10 upx;
.price { .price {

8
mallplusui-uniapp-app/pages/order/createStoreOrder.vue
View File

@@ -37,7 +37,7 @@
</view> --> </view> -->
<!-- 商品列表 --> <!-- 商品列表 -->
<view class="g-item" v-for="(item, index) in item1.cartPromotionItemList" :key="index"> <view class="g-item" v-for="(item, index) in item1.cartPromotionItemList" :key="index">
<image :src="item.productPic"></image> <image :src="item.productPic"></image>
<view class="right"> <view class="right">
<text class="title clamp">{{ item.productName }}</text> <text class="title clamp">{{ item.productName }}</text>
<text class="spec" v-if="item.productAttr">{{ item.productAttr }}</text> <text class="spec" v-if="item.productAttr">{{ item.productAttr }}</text>
@@ -531,13 +531,14 @@
.g-item { .g-item {
display: flex; display: flex;
padding-top: 15px;
margin: 20upx 30upx; margin: 20upx 30upx;
image { image {
flex-shrink: 0; flex-shrink: 0;
display: block; display: block;
width: 140upx; width: 100upx;
height: 140upx; height: 100upx;
border-radius: 4upx; border-radius: 4upx;
} }
@@ -548,7 +549,6 @@
} }
.title { .title {
margin-top: 10px;
font-size: 30upx; font-size: 30upx;
color: $font-color-dark; color: $font-color-dark;
} }

6
mallplusui-uniapp-app/pages/order/order.vue
View File

@@ -35,8 +35,9 @@
<view class="right" @click="navToDetailPage(item)"> <view class="right" @click="navToDetailPage(item)">
<text class="title clamp">{{ goodsItem.productName }}</text> <text class="title clamp">{{ goodsItem.productName }}</text>
<view class="num_price"> <view class="num_price">
<text class="attr-box">x {{ goodsItem.productQuantity }}</text>
<text class="price">{{ goodsItem.productPrice }}</text> <text class="price">{{ goodsItem.productPrice }}</text>
<text class="attr-box">x {{ goodsItem.productQuantity }}</text>
</view> </view>
@@ -537,13 +538,14 @@
margin-top: 5px; margin-top: 5px;
.attr-box { .attr-box {
flex: 1;
font-size: $font-sm + 2upx; font-size: $font-sm + 2upx;
color: $font-color-light; color: $font-color-light;
margin: 0 2upx 0 8upx; margin: 0 2upx 0 8upx;
} }
.price { .price {
flex: 1;
font-size: $font-base + 2upx; font-size: $font-base + 2upx;
color: $font-color-dark; color: $font-color-dark;

31
mallplusui-uniapp-app/pages/order/orderDetail.vue
View File

@@ -22,8 +22,9 @@
<view class="right"> <view class="right">
<text class="title clamp">{{ goodsItem.productName }}</text> <text class="title clamp">{{ goodsItem.productName }}</text>
<view class="num_price"> <view class="num_price">
<text class="price">{{ goodsItem.productPrice }}</text>
<text class="attr-box">x {{ goodsItem.productQuantity }}</text> <text class="attr-box">x {{ goodsItem.productQuantity }}</text>
<text class="price">{{ goodsItem.productPrice }}</text>
</view> </view>
<view style="display: flex;flex-direction: row;"> <view style="display: flex;flex-direction: row;">
<text style="color: #c1c1c1;font-size: 13px;" <text style="color: #c1c1c1;font-size: 13px;"
@@ -49,10 +50,11 @@
</view> --> </view> -->
<view style="display: flex;flex-direction: column; margin-right: 13px;margin-bottom: 10px;"> <view style="display: flex;flex-direction: column; margin-right: 13px;margin-bottom: 10px;">
<view class="price-box"> <!-- <view class="price-box">
共 共
<text class="num">{{ orderInfo.orderItemList.length }}</text> <text class="num">{{ orderInfo.orderItemList.length }}</text>
件商品, 会员折扣 件商品
, 会员折扣
<text class="price">{{ orderInfo.vipAmount }}</text> <text class="price">{{ orderInfo.vipAmount }}</text>
, 优惠券抵扣 , 优惠券抵扣
<text class="price">{{ orderInfo.couponAmount }}</text> <text class="price">{{ orderInfo.couponAmount }}</text>
@@ -62,13 +64,30 @@
<text class="price">{{ orderInfo.integrationAmount }}</text> <text class="price">{{ orderInfo.integrationAmount }}</text>
, 运费 , 运费
<text class="price">{{ orderInfo.freightAmount }}</text> <text class="price">{{ orderInfo.freightAmount }}</text>
<!-- <view class="yt-list-cell b-b" v-if="groupActivity"> <view class="yt-list-cell b-b" v-if="groupActivity">
<text class="cell-tit clamp">活动金额</text> <text class="cell-tit clamp">活动金额</text>
<text class="cell-tip">￥{{ groupActivity.price }}</text> <text class="cell-tip">￥{{ groupActivity.price }}</text>
</view>
, 实付款
<text class="price">{{ orderInfo.payAmount }}</text>
</view> --> </view> -->
<view class="price-box">
共
<text class="num">{{ orderInfo.orderItemList.length }}</text>
件商品
</view>
<view class="price-box">
优惠券抵扣
<text class="price">{{ orderInfo.couponAmount }}</text>
, 运费
<text class="price">{{ orderInfo.freightAmount }}</text>
, 实付款 , 实付款
<text class="price">{{ orderInfo.payAmount }}</text> <text class="price">{{ orderInfo.payAmount }}</text>
</view> </view>
</view> </view>
<view class="action-box b-t" v-if="orderInfo.status==12||orderInfo.status==3"> <view class="action-box b-t" v-if="orderInfo.status==12||orderInfo.status==3">
<button v-if="orderInfo.status == 12" class="action-btn" <button v-if="orderInfo.status == 12" class="action-btn"
@@ -442,7 +461,6 @@
.title { .title {
font-size: $font-base + 2upx; font-size: $font-base + 2upx;
color: $font-color-dark; color: $font-color-dark;
line-height: 1;
} }
.num_price { .num_price {
@@ -452,13 +470,14 @@
margin-top: 5px; margin-top: 5px;
.attr-box { .attr-box {
flex: 1;
font-size: $font-sm + 2upx; font-size: $font-sm + 2upx;
color: $font-color-light; color: $font-color-light;
margin: 0 2upx 0 8upx; margin: 0 2upx 0 8upx;
} }
.price { .price {
flex: 1;
font-size: $font-base + 2upx; font-size: $font-base + 2upx;
color: $font-color-dark; color: $font-color-dark;