cxc/yshopb2c-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

合并

Browse Source
This commit is contained in:
Gaoxs
2020-09-15 15:43:37 +08:00
parent 90cb82c1c5 cd4be74b4e
commit 3b6dc0faee
9 changed files with 5683 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

184
components/colorui/animation.css Normal file
View File

@ -0,0 +1,184 @@
/*
Animation 微动画
基于ColorUI组建库的动画模块 by 文晓港 2019年3月26日19:52:28
*/
/* css 滤镜 控制黑白底色gif的 */
.gif-black{
mix-blend-mode: screen;
}
.gif-white{
mix-blend-mode: multiply;
}
/* Animation css */
[class*=animation-] {
animation-duration: .5s;
animation-timing-function: ease-out;
animation-fill-mode: both
}
.animation-fade {
animation-name: fade;
animation-duration: .8s;
animation-timing-function: linear
}
.animation-scale-up {
animation-name: scale-up
}
.animation-scale-down {
animation-name: scale-down
}
.animation-slide-top {
animation-name: slide-top
}
.animation-slide-bottom {
animation-name: slide-bottom
}
.animation-slide-left {
animation-name: slide-left
}
.animation-slide-right {
animation-name: slide-right
}
.animation-shake {
animation-name: shake
}
.animation-reverse {
animation-direction: reverse
}
@keyframes fade {
0% {
opacity: 0
}
100% {
opacity: 1
}
}
@keyframes scale-up {
0% {
opacity: 0;
transform: scale(.2)
}
100% {
opacity: 1;
transform: scale(1)
}
}
@keyframes scale-down {
0% {
opacity: 0;
transform: scale(1.8)
}
100% {
opacity: 1;
transform: scale(1)
}
}
@keyframes slide-top {
0% {
opacity: 0;
transform: translateY(-100%)
}
100% {
opacity: 1;
transform: translateY(0)
}
}
@keyframes slide-bottom {
0% {
opacity: 0;
transform: translateY(100%)
}
100% {
opacity: 1;
transform: translateY(0)
}
}
@keyframes shake {
0%,
100% {
transform: translateX(0)
}
10% {
transform: translateX(-9px)
}
20% {
transform: translateX(8px)
}
30% {
transform: translateX(-7px)
}
40% {
transform: translateX(6px)
}
50% {
transform: translateX(-5px)
}
60% {
transform: translateX(4px)
}
70% {
transform: translateX(-3px)
}
80% {
transform: translateX(2px)
}
90% {
transform: translateX(-1px)
}
}
@keyframes slide-left {
0% {
opacity: 0;
transform: translateX(-100%)
}
100% {
opacity: 1;
transform: translateX(0)
}
}
@keyframes slide-right {
0% {
opacity: 0;
transform: translateX(100%)
}
100% {
opacity: 1;
transform: translateX(0)
}
}

65
components/colorui/components/cu-custom.vue Normal file
View File

@ -0,0 +1,65 @@
<template>
<view>
<view class="cu-custom" :style="[{height:CustomBar + 'px'}]">
<view class="cu-bar fixed" :style="style" :class="[bgImage!=''?'none-bg text-white bg-img':'',bgColor]">
<view class="action" @tap="BackPage" v-if="isBack">
<text class="cuIcon-back"></text>
<slot name="backText"></slot>
</view>
<view class="content" :style="[{top:StatusBar + 'px'}]">
<slot name="content"></slot>
</view>
<slot name="right"></slot>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
StatusBar: this.StatusBar,
CustomBar: this.CustomBar
};
},
name: 'cu-custom',
computed: {
style() {
var StatusBar= this.StatusBar;
var CustomBar= this.CustomBar;
var bgImage = this.bgImage;
var style = `height:${CustomBar}px;padding-top:${StatusBar}px;`;
if (this.bgImage) {
style = `${style}background-image:url(${bgImage});`;
}
return style
}
},
props: {
bgColor: {
type: String,
default: ''
},
isBack: {
type: [Boolean, String],
default: false
},
bgImage: {
type: String,
default: ''
},
},
methods: {
BackPage() {
uni.navigateBack({
delta: 1
});
}
}
}
</script>
<style>
</style>

1226
components/colorui/icon.css Normal file
View File

File diff suppressed because one or more lines are too long

4040
components/colorui/main.css Normal file
View File

File diff suppressed because it is too large Load Diff

4
config/index.js
View File

@ -1,8 +1,12 @@
<<<<<<< HEAD
// export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api'; export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
// export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api'; // export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api';
// export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
// export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
=======
export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
>>>>>>> cd4be74b4e66d2c142be343c65dc2de48ad97bd8
export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static'; export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static';

12
main.js
View File

@ -6,7 +6,7 @@ import store from "./store";
import schema from "async-validator"; import schema from "async-validator";
import dialog from "./utils/dialog"; import dialog from "./utils/dialog";
import cookie from "@/utils/store/cookie"; import cookie from "@/utils/store/cookie";
import cuCustom from '@/components/colorui/components/cu-custom.vue'
// // import "@/assets/iconfont/iconfont"; // // import "@/assets/iconfont/iconfont";
// import "@/assets/iconfont/iconfont.css"; // import "@/assets/iconfont/iconfont.css";
// // import "@/assets/js/media_750"; // // import "@/assets/js/media_750";
@ -16,9 +16,9 @@ import cookie from "@/utils/store/cookie";
// import "@/assets/css/style.less"; // import "@/assets/css/style.less";
// // 引入微信jssdk // // 引入微信jssdk
// var jweixin = require('jweixin-module') // var jweixin = require('jweixin-module')
// jweixin.ready(function(){ // jweixin.ready(function(){
// // TODO // // TODO
// }); // });
import { import {
@ -30,7 +30,7 @@ import {
VUE_APP_RESOURCES_URL, VUE_APP_RESOURCES_URL,
VUE_APP_API_URL VUE_APP_API_URL
} from "@/config"; } from "@/config";
Vue.component('cu-custom', cuCustom);
Vue.config.productionTip = false; Vue.config.productionTip = false;
Vue.config.devtools = process.env.NODE_ENV !== "production"; Vue.config.devtools = process.env.NODE_ENV !== "production";
@ -81,7 +81,7 @@ Object.defineProperty(Vue.prototype, '$yroute', {
Vue.prototype.$VUE_APP_RESOURCES_URL = VUE_APP_RESOURCES_URL Vue.prototype.$VUE_APP_RESOURCES_URL = VUE_APP_RESOURCES_URL
Vue.prototype.$VUE_APP_API_URL = VUE_APP_API_URL Vue.prototype.$VUE_APP_API_URL = VUE_APP_API_URL
Vue.component('cu-custom', cuCustom);
// #ifdef H5 // #ifdef H5
// H5编译的代码 // H5编译的代码

209
pages/Loading/index.vue
View File

@ -1,105 +1,124 @@
<template> <template>
<view class="lottie-bg"> <view class="lottie-bg">
<view id="lottie"> <view id="lottie">
<image src="../../static/images/live-logo.gif" rel="preload" mode="widthFix" style="width: 100%;" /> <image src="../../static/images/live-logo.gif" rel="preload" mode="widthFix" style="width: 100%;" />
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import { import {
mapState, mapState,
mapMutations, mapMutations,
mapActions mapActions
} from "vuex"; } from "vuex";
// 组件 // 组件
// import request from "@//api/request"; // import request from "@//api/request";
import { import {
wxappAuth, wxappAuth,
getUser getUser
} from "@/api/user"; } from "@/api/user";
import dayjs from "dayjs"; import dayjs from "dayjs";
import cookie from "@/utils/store/cookie"; import cookie from "@/utils/store/cookie";
import { import {
parseQuery, parseQuery,
login, login,
handleQrCode, handleQrCode,
getCurrentPageUrl, getCurrentPageUrl,
handleUrlParam handleUrlParam
} from "@/utils"; } from "@/utils";
export default { export default {
name: "Loading", name: "Loading",
data() { data() {
return {}; return {};
}, },
onShow() { onShow() {
var url = handleQrCode(); var url = handleQrCode();
if (!url) { if (!url) {
url = handleUrlParam(getCurrentPageUrl()) url = handleUrlParam(getCurrentPageUrl())
} }
// 判断是否是分销 // 判断是否是分销
if (url) { if (url) {
var spread = cookie.get("spread"); var spread = cookie.get("spread");
let urlSpread = parseInt(url.spread); let urlSpread = parseInt(url.spread);
if (!Number.isNaN(urlSpread) && spread !== urlSpread) { if (!Number.isNaN(urlSpread) && spread !== urlSpread) {
cookie.set("spread", urlSpread || 0); cookie.set("spread", urlSpread || 0);
} else if (spread === 0 || typeof spread !== "number") { } else if (spread === 0 || typeof spread !== "number") {
cookie.set("spread", urlSpread || 0); cookie.set("spread", urlSpread || 0);
} }
if (this.$store.getters.token) { if (this.$store.getters.token) {
this.toLaunch(); this.toLaunch();
return; return;
} }
if (this.$deviceType == "app" || this.$deviceType == "h5") { // cookie.get("spread");
this.$yrouter.switchTab({ // if (this.$deviceType == "weixin") {
path: "/pages/home/index" // let path = parseQuery().path
}); // console.log(this)
return; // if (path) {
} // this.$yrouter.push({
login().finally(() => { // path
this.$yrouter.switchTab({ // });
path: "/pages/home/index" // } else {
}); // this.$yrouter.switchTab({
}); // path: "/pages/home/index"
} // });
}, // }
methods: {
...mapActions(["changeAuthorization", "setUserInfo"]), // return
toLaunch() { // }
console.log("loading home"); // this.toLaunch();
this.changeAuthorization(false); if (this.$deviceType == "app" || this.$deviceType == "h5") {
this.$yrouter.switchTab({ // this.toLaunch();
path: "/pages/home/index"
}); this.$yrouter.switchTab({
} path: "/pages/home/index"
} });
}; return;
}
login().finally(() => {
this.$yrouter.switchTab({
path: "/pages/home/index"
});
});
}
},
methods: {
...mapActions(["changeAuthorization", "setUserInfo"]),
toLaunch() {
console.log("loading home");
this.changeAuthorization(false);
this.$yrouter.switchTab({
path: "/pages/home/index"
});
}
}
};
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.lottie-bg { .lottie-bg {
position: fixed; position: fixed;
left: 0; left: 0;
top: 0; top: 0;
background-color: #fff; background-color: #fff;
width: 100%; width: 100%;
height: 100%; height: 100%;
z-index: 999; z-index: 999;
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;
-webkit-align-items: center; -webkit-align-items: center;
align-items: center; align-items: center;
-webkit-justify-content: center; -webkit-justify-content: center;
justify-content: center; justify-content: center;
} }
#lottie { #lottie {
width: 35%; width: 35%;
display: block; display: block;
overflow: hidden; overflow: hidden;
transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0);
margin: auto; margin: auto;
} }
</style> </style>

60
pages/home/index.vue
View File

@ -1,18 +1,26 @@
<template> <template>
<view class="index"> <view class="index">
<!-- 导航栏 --> <!-- 导航栏 -->
<view class="head_box " :style="{ background: bgcolor }" :class="{ active: bgcolor }"> <!-- <view class="head_box " :style="{ background: bgcolor }" :class="{ active: bgcolor }">-->
<view class="cu-custom" :style="[{height:CustomBar+ 'px',}]"> <!-- <view class="cu-custom" :style="[{height:CustomBar+ 'px',}]">-->
<view class="cu-bar fixed" :style="customStyle" :class="[bgcolor]"> <!-- <view class="cu-bar fixed" :style="customStyle" :class="[bgcolor]">-->
<view class="action"> <!-- <view class="action">-->
<text class="nav-title Shop-selector-rect">{{ 'yshop商城' }}</text> <!-- <text class="nav-title Shop-selector-rect">{{ 'yshop商城' }}</text>-->
</view> <!-- </view>-->
<view class="content" :style="[{top:StatusBar + 'px'}]"> <!-- <view class="content" :style="[{top:StatusBar + 'px'}]">-->
</view> <!-- </view>-->
</view> <!-- </view>-->
</view> <!-- </view>-->
</view> <!-- </view>-->
<view class="head_box " :style="{ background: bgcolor }" :class="{ active: bgcolor }">
<cu-custom :isBack="true" >
<block slot="backText">
<text class="nav-title shopro-selector-rect">{{ 'YSHOP商城' }}</text>
</block>
</cu-custom>
</view>
<view class="header header-search acea-row row-center-wrapper" :style="{ background: bgcolor }"> <view class="header header-search acea-row row-center-wrapper" :style="{ background: bgcolor }">
<view @click="goGoodSearch()" class="search acea-row row-middle"> <view @click="goGoodSearch()" class="search acea-row row-middle">
<text class="iconfont icon-xiazai5"></text> <text class="iconfont icon-xiazai5"></text>
@ -381,24 +389,22 @@
} }
} }
.head_box { .head_box {
position: relative; width: 750rpx;
z-index: 10; // background: #fff;
width: 100%; transition: all linear 0.3s;
// background: #fff;
transition: all linear 0.3s;
/deep/.cuIcon-back { /deep/.cuIcon-back {
display: none; display: none;
} }
.nav-title { .nav-title {
font-size: 38rpx; font-size: 38rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #fff; color: #fff;
} }
} }
.cu-bar.fixed { .cu-bar.fixed {
position: fixed; position: fixed;

11
utils/index.js
View File

@ -92,7 +92,11 @@ export function parseQuery() {
// #ifdef H5 // #ifdef H5
<<<<<<< HEAD
const res = {}; const res = {};
=======
let res = {};
>>>>>>> cd4be74b4e66d2c142be343c65dc2de48ad97bd8
const query = (location.href.split("?")[1] || "") const query = (location.href.split("?")[1] || "")
.trim() .trim()
@ -116,13 +120,20 @@ export function parseQuery() {
} }
}); });
// #endif // #endif
<<<<<<< HEAD
=======
>>>>>>> cd4be74b4e66d2c142be343c65dc2de48ad97bd8
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
var pages = getCurrentPages() //获取加载的页面 var pages = getCurrentPages() //获取加载的页面
var currentPage = pages[pages.length - 1] //获取当前页面的对象 var currentPage = pages[pages.length - 1] //获取当前页面的对象
var url = currentPage.route //当前页面url var url = currentPage.route //当前页面url
<<<<<<< HEAD
var res = currentPage.options //如果要获取url中所带的参数可以查看options var res = currentPage.options //如果要获取url中所带的参数可以查看options
=======
res = currentPage.options //如果要获取url中所带的参数可以查看options
>>>>>>> cd4be74b4e66d2c142be343c65dc2de48ad97bd8
// #endif // #endif
return res return res