diff --git a/yudao-ui-admin/src/components/Category/list.vue b/yudao-ui-admin/src/components/Category/list.vue index 42e21d048..0648dd44b 100644 --- a/yudao-ui-admin/src/components/Category/list.vue +++ b/yudao-ui-admin/src/components/Category/list.vue @@ -31,7 +31,7 @@ - 新增{{ biztype.name }} + 新增{{ biztype.name }} @@ -100,8 +101,8 @@ size="small" @click="handleAddMenu(scope.row)" >添加子目录 - 编辑 - 删除 + 编辑 + 删除 diff --git a/yudao-ui-admin/src/views/mall/product/store/index.vue b/yudao-ui-admin/src/views/mall/product/store/index.vue index ff41e3f39..ab437b564 100644 --- a/yudao-ui-admin/src/views/mall/product/store/index.vue +++ b/yudao-ui-admin/src/views/mall/product/store/index.vue @@ -17,8 +17,8 @@ - - 添加商品 + + 添加商品 导出 @@ -119,23 +119,24 @@ active-text="上架" inactive-text="下架" @change="onchangeIsShow(scope.row)" + v-hasPermi="['admin:product:u' && 'admin:product:down']" /> -
+
{ + console.log(res) return { jsapiResult: res.jsapiConfig, - body: res.data + body: res.body } }, wxPaySuccess: () => { diff --git a/yudao-ui-app/pages/goods_cate/goods_cate.vue b/yudao-ui-app/pages/goods_cate/goods_cate.vue index 46b651193..9cd6e1253 100644 --- a/yudao-ui-app/pages/goods_cate/goods_cate.vue +++ b/yudao-ui-app/pages/goods_cate/goods_cate.vue @@ -12,13 +12,13 @@ {{item.name}} - + - + @@ -72,7 +72,7 @@ let len = that.productList.length; let child = that.productList[len - 1]&&that.productList[len - 1].child?that.productList[len - 1].child:[]; this.number = child?child.length:0; - + //设置商品列表高度 uni.getSystemInfo({ success: function(res) { @@ -145,7 +145,7 @@ z-index: 9; border-bottom: 1rpx solid #f5f5f5; } - + .productSort .header .input { width: 700rpx; height: 60rpx; @@ -154,22 +154,22 @@ box-sizing: border-box; padding: 0 25rpx; } - + .productSort .header .input .iconfont { font-size: 26rpx; color: #555; } - + .productSort .header .input .placeholder { color: #999; } - + .productSort .header .input input { font-size: 26rpx; height: 100%; width: 597rpx; } - + .productSort .aside { position: fixed; width: 180rpx; @@ -178,18 +178,18 @@ background-color: #f7f7f7; overflow-y: scroll; overflow-x: hidden; - + height: auto; margin-top: 96rpx; } - + .productSort .aside .item { height: 100rpx; width: 100%; font-size: 26rpx; color: #424242; } - + .productSort .aside .item.on { background-color: #fff; border-left: 4rpx solid #fc4141; @@ -198,49 +198,49 @@ color: #fc4141; font-weight: bold; } - + .productSort .conter { margin: 96rpx 0 0 180rpx; padding: 0 14rpx; background-color: #fff; } - + .productSort .conter .listw { padding-top: 20rpx; } - + .productSort .conter .listw .title { height: 90rpx; } - + .productSort .conter .listw .title .line { width: 100rpx; height: 2rpx; background-color: #f0f0f0; } - + .productSort .conter .listw .title .name { font-size: 28rpx; color: #333; margin: 0 30rpx; font-weight: bold; } - + .productSort .conter .list { flex-wrap: wrap; } - + .productSort .conter .list .item { width: 177rpx; margin-top: 26rpx; } - + .productSort .conter .list .item .picture { width: 120rpx; height: 120rpx; border-radius: 50%; } - + .productSort .conter .list .item .picture image { width: 100%; height: 100%; @@ -249,7 +249,7 @@ background-color: #f7f7f7; } } - + .productSort .conter .list .item .name { font-size: 24rpx; color: #333; diff --git a/yudao-ui-app/pages/member_application/index.vue b/yudao-ui-app/pages/member_application/index.vue index c26832443..a8d4d354c 100644 --- a/yudao-ui-app/pages/member_application/index.vue +++ b/yudao-ui-app/pages/member_application/index.vue @@ -221,7 +221,6 @@ background-size: cover; background-repeat: no-repeat; background-attachment: fixed; - overflow: hidden; .u-nav-slot{ ::v-deep .u-popup__content{ padding-bottom: 20% !important; diff --git a/yudao-ui-app/pages/member_equity/index.vue b/yudao-ui-app/pages/member_equity/index.vue index 1d94bb1f6..5ca58bc0d 100644 --- a/yudao-ui-app/pages/member_equity/index.vue +++ b/yudao-ui-app/pages/member_equity/index.vue @@ -10,7 +10,7 @@ 再升1级即可获得【XX】等6项权益 - 购买记录 + 购买记录 @@ -258,6 +258,7 @@ } .right-button { + border: 1px solid; border-radius: 18rpx; margin-top: 10rpx; padding: 7rpx 16rpx; diff --git a/yudao-ui-app/pages/member_loding/index.vue b/yudao-ui-app/pages/member_loding/index.vue index 07730a539..b57723d69 100644 --- a/yudao-ui-app/pages/member_loding/index.vue +++ b/yudao-ui-app/pages/member_loding/index.vue @@ -22,7 +22,7 @@ const res = await memberGradeInfo() if(res.data.some((item) => !!parseInt(item.isExist))){ uni.setTabBarItem({ - index: 0, + index: 2, pagePath: '/pages/member_equity/index' }) uni.switchTab({ @@ -30,7 +30,7 @@ }) }else{ uni.setTabBarItem({ - index: 0, + index: 2, pagePath: '/pages/member_application/index' }) uni.switchTab({ diff --git a/yudao-ui-app/pages/member_renew/index.vue b/yudao-ui-app/pages/member_renew/index.vue index 8c99736c8..9d22962f9 100644 --- a/yudao-ui-app/pages/member_renew/index.vue +++ b/yudao-ui-app/pages/member_renew/index.vue @@ -121,7 +121,6 @@ import store from '@/store/index'; * */ goPay() { - console.log(this.activeIndex) if(this.activeIndex.length){ this.$set(this, 'pay_close', true); const orderInfos = this.activeIndex.map((item) => { diff --git a/yudao-ui-app/pages/sale_performance/index.vue b/yudao-ui-app/pages/sale_performance/index.vue new file mode 100644 index 000000000..a5b104ab9 --- /dev/null +++ b/yudao-ui-app/pages/sale_performance/index.vue @@ -0,0 +1,280 @@ + + + + + diff --git a/yudao-ui-app/static/images/fillet1.png b/yudao-ui-app/static/images/fillet1.png new file mode 100644 index 000000000..1c2724189 Binary files /dev/null and b/yudao-ui-app/static/images/fillet1.png differ diff --git a/yudao-ui-app/static/images/fillet2.png b/yudao-ui-app/static/images/fillet2.png new file mode 100644 index 000000000..13572b358 Binary files /dev/null and b/yudao-ui-app/static/images/fillet2.png differ diff --git a/yudao-ui-app/static/images/fillet3.png b/yudao-ui-app/static/images/fillet3.png new file mode 100644 index 000000000..d45353742 Binary files /dev/null and b/yudao-ui-app/static/images/fillet3.png differ diff --git a/yudao-ui-app/static/images/money1.png b/yudao-ui-app/static/images/money1.png new file mode 100644 index 000000000..ef7e5d875 Binary files /dev/null and b/yudao-ui-app/static/images/money1.png differ diff --git a/yudao-ui-app/static/images/money2.png b/yudao-ui-app/static/images/money2.png new file mode 100644 index 000000000..96e24700b Binary files /dev/null and b/yudao-ui-app/static/images/money2.png differ diff --git a/yudao-ui-app/static/images/money3.png b/yudao-ui-app/static/images/money3.png new file mode 100644 index 000000000..f8539d75a Binary files /dev/null and b/yudao-ui-app/static/images/money3.png differ diff --git a/yudao-ui-app/static/images/money4.png b/yudao-ui-app/static/images/money4.png new file mode 100644 index 000000000..0db70a38a Binary files /dev/null and b/yudao-ui-app/static/images/money4.png differ diff --git a/yudao-ui-app/static/images/money_total.png b/yudao-ui-app/static/images/money_total.png new file mode 100644 index 000000000..6fe5c4b2b Binary files /dev/null and b/yudao-ui-app/static/images/money_total.png differ diff --git a/yudao-ui-app/static/images/sale_bg.png b/yudao-ui-app/static/images/sale_bg.png new file mode 100644 index 000000000..219ddfa73 Binary files /dev/null and b/yudao-ui-app/static/images/sale_bg.png differ