diff --git a/components/cusPreviewImg/index.vue b/components/cusPreviewImg/index.vue deleted file mode 100644 index 1a27fa2..0000000 --- a/components/cusPreviewImg/index.vue +++ /dev/null @@ -1,159 +0,0 @@ - - - - - diff --git a/main.js b/main.js index bbed003..33c8a5e 100644 --- a/main.js +++ b/main.js @@ -23,6 +23,12 @@ Vue.prototype.$eventHub = new Vue(); Vue.config.productionTip = false import uView from "uview-ui"; Vue.use(uView); +// 或者按需引入部分组件 +// import { uPopup,uInput,uParse,uNoticeBar } from 'uview-ui' +// Vue.component('u-popup', uPopup) +// Vue.component('u--input', uInput) +// Vue.component('u-parse', uParse) +// Vue.component('u-notice-bar', uNoticeBar) // #ifdef H5 import { parseQuery } from "./utils"; import Auth from './libs/wechat'; diff --git a/manifest.json b/manifest.json index 98c67e5..9d636fb 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "CRMEB", - "appid" : "__UNI__99FC347", + "appid" : "__UNI__241B89A", "description" : "", "versionName" : "1.0.4", "versionCode" : 127, @@ -173,7 +173,7 @@ "requiredPrivateInfos" : [ "getLocation", "chooseAddress" ], "usingComponents" : true, "__usePrivacyCheck__" : true, - "libVersion":"latest" + "libVersion" : "latest" }, "mp-alipay" : { "usingComponents" : true diff --git a/pages.json b/pages.json index b9533cf..911baa5 100644 --- a/pages.json +++ b/pages.json @@ -39,51 +39,78 @@ "navigationStyle": "custom" } }, - { - "path": "pages/small_page/index", - "style": { - "navigationBarTitleText": "微页面" - // "navigationStyle": "custom", - - } - }, - { - "path": "pages/goods_details/index", - "style": { - "navigationStyle": "custom" - // #ifdef MP || APP-PLUS - , - "navigationBarBackgroundColor": "#F2F2F2" - // #endif - } - }, { "path": "pages/goods_cate/goods_cate", "style": { "enablePullDownRefresh": true, "navigationBarTitleText": "商品分类" } - }, - { - "path": "pages/auth/index", - "style": { - "navigationBarTitleText": "加载中" - } - }, - { - "path": "pages/order_pay_status/index", - "style": { - "navigationBarTitleText": "支付状态" - } - }, - { - "path": "pages/error/index", - "style": { - "navigationBarTitleText": "网站已关闭" - } } + ], "subPackages": [{ + "root": "pages/auth", + "name": "auth", + "pages": [ + { + "path": "index", + "style": { + "navigationBarTitleText": "加载中" + } + } + ] + },{ + "root": "pages/goods_details", + "name": "goods_details", + "pages": [ + { + "path": "index", + "style": { + "navigationStyle": "custom" + // #ifdef MP || APP-PLUS + , + "navigationBarBackgroundColor": "#F2F2F2" + // #endif + } + } + ] + },{ + "root": "pages/small_page", + "name": "small_page", + "pages": [ + { + "path": "index", + "style": { + "navigationBarTitleText": "微页面" + + } + } + ] + },{ + "root": "pages/error", + "name": "error", + "pages": [ + { + "path": "index", + "style": { + "navigationBarTitleText": "网站已关闭" + + } + } + ] + },{ + "root": "pages/order_pay_status", + "name": "order_pay_status", + "pages": [ + { + "path": "index", + "style": { + "navigationBarTitleText": "支付状态" + + } + } + ] + },{ "root": "pages/order_pay_back", "name": "order_pay_back", "pages": [ @@ -347,7 +374,7 @@ { "path": "user_cash/index", "style": { - "navigationBarTitleText": "提现" + "navigationBarTitleText": "申请提现" } }, { @@ -892,24 +919,6 @@ "navigationBarTitleText": "内容详情" } }, - { - "path": "plant_release/index", - "style": { - "navigationBarTitleText": "内容发布" - } - }, - { - "path": "plant_show/index", - "style": { - "navigationBarTitleText": "种草秀" - } - }, - { - "path": "plant_topic/index", - "style": { - "navigationBarTitleText": "话题筛选" - } - }, { "path": "plant_search/index", "style": { @@ -1151,27 +1160,7 @@ } ] }, - { - "root": "pages/short_video", - "name": "shortVideo", - "pages": [{ - "navigationBarTitleText": "短视频", - "enablePullDownRefresh": false, - //#ifdef APP - "path": "appSwiper/index", - //#endif - //#ifndef APP - "path": "nvueSwiper/index", - //#endif - "style": { - "navigationBarTitleText": "社区短视频", - "app-plus": { - "titleNView": false, - "bounce": "none" - } - } - }] - }, + { "root": "pages/points_mall", "pages": [{ diff --git a/pages/activity/assist_detail/index.vue b/pages/activity/assist_detail/index.vue index 380fb9d..bbb248d 100644 --- a/pages/activity/assist_detail/index.vue +++ b/pages/activity/assist_detail/index.vue @@ -294,7 +294,7 @@ PromotionCode: '', //二维码图片 canvasStatus: false, //海报绘图标签 posterImage: '', //海报路径 - posterbackgd: '/static/images/posterbackgd.png', + posterbackgd: 'https://b3.njrenzhou.com/static/images/posterbackgd.png', isDown: true, isCopy: false, copyUrl: '', diff --git a/pages/activity/combination_details/index.vue b/pages/activity/combination_details/index.vue index c7978a9..0a8ed01 100644 --- a/pages/activity/combination_details/index.vue +++ b/pages/activity/combination_details/index.vue @@ -433,7 +433,7 @@ PromotionCode: '', //二维码图片 canvasStatus: false, //海报绘图标签 posterImage: '', //海报路径 - posterbackgd: '/static/images/posterbackgd.png', + posterbackgd: 'https://b3.njrenzhou.com/static/images/posterbackgd.png', sharePacket: { isState: true, //默认不显示 }, //分销商详细 diff --git a/pages/activity/goods_seckill_details/index.vue b/pages/activity/goods_seckill_details/index.vue index 0b8924f..2ceddb6 100644 --- a/pages/activity/goods_seckill_details/index.vue +++ b/pages/activity/goods_seckill_details/index.vue @@ -345,7 +345,7 @@ PromotionCode: '', //二维码图片 canvasStatus: false, //海报绘图标签 posterImage: '', //海报路径 - posterbackgd: '/static/images/posterbackgd.png', + posterbackgd: 'https://b3.njrenzhou.com/static/images/posterbackgd.png', // uid: 0, //用户uid circular: false, autoplay: false, diff --git a/pages/activity/presell_details/index.vue b/pages/activity/presell_details/index.vue index 6f72369..62198d7 100644 --- a/pages/activity/presell_details/index.vue +++ b/pages/activity/presell_details/index.vue @@ -447,7 +447,7 @@ PromotionCode: '', //二维码图片 canvasStatus: false, //海报绘图标签 posterImage: '', //海报路径 - posterbackgd: '/static/images/posterbackgd.png', + posterbackgd: 'https://b3.njrenzhou.com/static/images/posterbackgd.png', sharePacket: { isState: true, //默认不显示 }, //分销商详细 diff --git a/pages/admin/goods_details/index.vue b/pages/admin/goods_details/index.vue index 589f902..4a6497d 100644 --- a/pages/admin/goods_details/index.vue +++ b/pages/admin/goods_details/index.vue @@ -323,7 +323,7 @@ storeImage: '', //海报产品图 canvasStatus: false, //海报绘图标签 posterImage: '', //海报路径 - posterbackgd: '/static/images/posterbackgd.png', + posterbackgd: 'https://b3.njrenzhou.com/static/images/posterbackgd.png', source: '', domain: HTTP_REQUEST_URL, sharePacket: { diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue index 25101ca..f019397 100644 --- a/pages/goods_details/index.vue +++ b/pages/goods_details/index.vue @@ -523,7 +523,7 @@ PromotionCode: '', //二维码图片 canvasStatus: false, //海报绘图标签 posterImage: '', //海报路径 - posterbackgd: '/static/images/posterbackgd.png', + posterbackgd: 'https://b3.njrenzhou.com/static/images/posterbackgd.png', source: '', sharePacket: { isState: true, //默认不显示 diff --git a/pages/index/index.vue b/pages/index/index.vue index 9d060fb..1b01106 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -60,26 +60,26 @@ - - - - + + + + - + - + - - + + - - + + - + @@ -289,30 +289,30 @@ import mConfig from './component/index.js'; // #endif import customTab from '@/components/customTab'; // #ifdef MP || APP-PLUS -import activeParty from './component/activeParty'; +// import activeParty from './component/activeParty'; import headerSerch from './component/headerSerch'; import homeComb from './component/homeComb'; import coupon from './component/coupon'; -import bargain from './component/bargain'; -import blankPage from './component/blankPage'; -import combination from './component/combination'; -import customerService from './component/customerService'; +// import bargain from './component/bargain'; +// import blankPage from './component/blankPage'; +// import combination from './component/combination'; +// import customerService from './component/customerService'; import goodList from './component/goodList'; import guide from './component/guide'; // import liveBroadcast from './component/liveBroadcast'; import menus from './component/menus'; -import news from './component/news'; +// import news from './component/news'; import topic from './component/topic'; import presellList from './component/presellList'; -import plantList from './component/plantList'; -import pictureCube from './component/pictureCube' +// import plantList from './component/plantList'; +// import pictureCube from './component/pictureCube' import shopList from './component/shopList'; -import richText from './component/richText'; -import seckill from './component/seckill'; +// import richText from './component/richText'; +// import seckill from './component/seckill'; import swiperBg from './component/swiperBg'; import tabNav from './component/tabNav'; import titles from './component/titles'; -import hotRanking from "./component/hotRanking.vue"; +// import hotRanking from "./component/hotRanking.vue"; // #endif import { silenceBindingSpread, configMap, isWeixin } from '@/utils/index'; import history from '@/mixins/history'; @@ -335,30 +335,30 @@ export default { ...mConfig, // #endif // #ifdef MP || APP-PLUS - activeParty, + // activeParty, headerSerch, homeComb, - bargain, + // bargain, coupon, - blankPage, - combination, - customerService, + // blankPage, + // combination, + // customerService, goodList, guide, // liveBroadcast, menus, - news, + // news, topic, presellList, - plantList, - pictureCube, + // plantList, + // pictureCube, shopList, - richText, - seckill, + // richText, + // seckill, swiperBg, tabNav, titles, - hotRanking + // hotRanking // #endif }, data() { diff --git a/pages/plantGrass/plant_release/index.vue b/pages/plantGrass/plant_release/index.vue deleted file mode 100644 index 1caf62a..0000000 --- a/pages/plantGrass/plant_release/index.vue +++ /dev/null @@ -1,786 +0,0 @@ - - - - - diff --git a/pages/plantGrass/plant_show/index.vue b/pages/plantGrass/plant_show/index.vue deleted file mode 100644 index a986ec1..0000000 --- a/pages/plantGrass/plant_show/index.vue +++ /dev/null @@ -1,195 +0,0 @@ - - - - - diff --git a/pages/plantGrass/plant_topic/index.vue b/pages/plantGrass/plant_topic/index.vue deleted file mode 100644 index 89a0c87..0000000 --- a/pages/plantGrass/plant_topic/index.vue +++ /dev/null @@ -1,179 +0,0 @@ - - - - \ No newline at end of file diff --git a/pages/points_mall/integral_goods_details.vue b/pages/points_mall/integral_goods_details.vue index 7e18b80..4bdfc55 100644 --- a/pages/points_mall/integral_goods_details.vue +++ b/pages/points_mall/integral_goods_details.vue @@ -74,8 +74,8 @@ - + @@ -96,7 +96,7 @@ import { postCartAdd } from '@/api/store.js'; import productConSwiper from '@/components/productConSwiper/index.vue' import productWindow from '@/components/productWindow'; - import cusPreviewImg from '@/components/cusPreviewImg'; + // import cusPreviewImg from '@/components/cusPreviewImg'; import parser from "@/components/jyf-parser/jyf-parser"; import { imageBase64 } from "@/api/public"; import { toLogin } from '@/libs/login.js'; @@ -172,7 +172,7 @@ components: { productConSwiper, productWindow, - cusPreviewImg, + // cusPreviewImg, "jyf-parser": parser, }, /** @@ -257,7 +257,7 @@ methods: { //点击sku图片打开轮播图 showImg(index){ - this.$refs.cusPreviewImg.open(this.selectSku.suk) + // this.$refs.cusPreviewImg.open(this.selectSku.suk) }, // app分享 // #ifdef APP-PLUS diff --git a/pages/prize/index.vue b/pages/prize/index.vue index 2518cfd..abbb2be 100644 --- a/pages/prize/index.vue +++ b/pages/prize/index.vue @@ -8,7 +8,7 @@ - + + + + + - + 取消 - + 继续抽 @@ -97,7 +104,22 @@ btnDisabled: '', title:'', subTitle:'', - type:1 + type:1, + noticeList:[ + '中奖公告183****8566中了20钻石', + '中奖公告152****2322中了20钻石', + '中奖公告181****5656中了20钻石', + '中奖公告152****8181中了20钻石', + '中奖公告136****2314中了20钻石', + '中奖公告196****5467中了20钻石', + '中奖公告132****7714中了20钻石', + '中奖公告132****7716中了20钻石', + '中奖公告185****4587中了20钻石', + '中奖公告182****6548中了20钻石', + '中奖公告183****5670中了20钻石', + '中奖公告161****0034中了20钻石', + ], + ruleText:'' } }, onLoad: function() { @@ -111,9 +133,10 @@ }, getPrizeDataHandle(){ getPrizeData().then(res=>{ - this.list = res.data; + this.list = res.data.list; // 获取奖品列表 - this.width = 360 / this.list.length + this.width = 360 / this.list.length; + this.ruleText = res.data.rule.the_lottery_rule2 }) }, animation(index, duration) @@ -136,6 +159,14 @@ this.btnDisabled = 'disabled'; }, + prizeAgain(){ + this.show=false; + setTimeout(()=>{ + this.playReward() + },500) + + + }, //发起抽奖 playReward(){ setPrizeApi().then(res=>{ @@ -228,7 +259,15 @@ height: 600upx; background-size: cover; border-radius: 50%; - + .shadow{ + position: absolute; + height: 56rpx; + width: auto; + bottom: -26rpx; + left: 50%; + transform: translateX(-50%); + z-index: 1; + } } @@ -403,11 +442,12 @@ margin-top:60rpx; display: flex; .cancelBtn{ - + flex:1; background: rgba(255,255,255,0); border-radius: 40px; border: 1px solid #CCCCCC; - padding:25rpx 50rpx; + padding:25rpx 0rpx; + text-align: center; font-family: Alibaba PuHuiTi; font-weight: 400; @@ -415,11 +455,11 @@ color: #666666; } .confirmBtn{ - + flex:1; background: linear-gradient(52deg, #FF3640, #FE7553); border-radius: 40px; - padding:25rpx 50rpx; - + padding:25rpx 0rpx; + text-align: center; font-family: Alibaba PuHuiTi; font-weight: 400; font-size: 30rpx; @@ -497,6 +537,12 @@ padding-top: 36upx; justify-content: center; } - +::v-deep .u-notice-bar{ + position: relative; + z-index: 2; + margin: 0 24rpx; + padding: 30rpx !important; + margin-top: 78rpx; +} diff --git a/pages/short_video/nvueSwiper/index.nvue b/pages/short_video/nvueSwiper/index.nvue index 6b1d55f..f1e7d1b 100644 --- a/pages/short_video/nvueSwiper/index.nvue +++ b/pages/short_video/nvueSwiper/index.nvue @@ -324,7 +324,7 @@ PromotionCode: '', //二维码图片 canvasStatus: false, //海报绘图标签 posterImage: '', //海报路径 - posterbackgd: '../static/img/index/posterbackgd.png', + posterbackgd: 'https://b3.njrenzhou.com/static/img/index/posterbackgd.png', avatar: '/static/images/f.png', codeImg: "", autoplay: false, diff --git a/pages/users/user_cash/index.vue b/pages/users/user_cash/index.vue index 83d375f..f62cb48 100644 --- a/pages/users/user_cash/index.vue +++ b/pages/users/user_cash/index.vue @@ -4,16 +4,17 @@ 提现至 - + + {{navList[currentTab]["name"]}} - + @@ -136,10 +137,14 @@ + + + 提现记录 + @@ -398,6 +403,11 @@ (action && this[action]) && this[action](value); this.currentTab = opt.type }, + cashRecord(){ + uni.navigateTo({ + url:'/pages/users/user_spread_money/index?type=1' + }) + } } } @@ -603,4 +613,8 @@ uni-toast.uni-mask{ background-color: rgba(0,0,0,0.5) !important; } + .cashRecord{ + text-align: center; + color: #116636; + } diff --git a/static/images/posterbackgd.png b/static/images/posterbackgd.png deleted file mode 100644 index b692920..0000000 Binary files a/static/images/posterbackgd.png and /dev/null differ diff --git a/static/images/posterbackgd1.png b/static/images/posterbackgd1.png deleted file mode 100644 index c553fd1..0000000 Binary files a/static/images/posterbackgd1.png and /dev/null differ diff --git a/static/images/shadow.png b/static/images/shadow.png new file mode 100644 index 0000000..d1f74a1 Binary files /dev/null and b/static/images/shadow.png differ