合并

components/colorui/animation.css

@@ -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)
+    }
+}

components/colorui/components/cu-custom.vue

@@ -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>

config/index.js

@@ -1,8 +1,12 @@
 
+<<<<<<< HEAD
 // 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 = '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://wxapi.yixiang.co/api';
+>>>>>>> cd4be74b4e66d2c142be343c65dc2de48ad97bd8
 export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static';
 

main.js

@@ -6,7 +6,7 @@ import store from "./store";
 import schema from "async-validator";
 import dialog from "./utils/dialog";
 import cookie from "@/utils/store/cookie";
-
+import cuCustom from '@/components/colorui/components/cu-custom.vue'
 // // import "@/assets/iconfont/iconfont";
 // import "@/assets/iconfont/iconfont.css";
 // // import "@/assets/js/media_750";
@@ -30,7 +30,7 @@ import {
 	VUE_APP_RESOURCES_URL,
 	VUE_APP_API_URL
 } from "@/config";
-
+Vue.component('cu-custom', cuCustom);
 Vue.config.productionTip = false;
 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_API_URL = VUE_APP_API_URL
-
+Vue.component('cu-custom', cuCustom);
 // #ifdef H5
 // H5编译的代码
 

pages/Loading/index.vue

@@ -52,7 +52,26 @@
           this.toLaunch();
           return;
         }
+        // cookie.get("spread");
+        // if (this.$deviceType == "weixin") {
+        //   let path = parseQuery().path
+        //   console.log(this)
+        //   if (path) {
+        //     this.$yrouter.push({
+        //       path
+        //     });
+        //   } else {
+        //     this.$yrouter.switchTab({
+        //       path: "/pages/home/index"
+        //     });
+        //   }
+
+        //   return
+        // }
+        // this.toLaunch();
         if (this.$deviceType == "app" || this.$deviceType == "h5") {
+          // this.toLaunch();
+
           this.$yrouter.switchTab({
             path: "/pages/home/index"
           });

pages/home/index.vue

@@ -1,17 +1,25 @@
 <template>
 	<view class="index">
 		<!-- 导航栏 -->
-		<view class="head_box " :style="{ background: bgcolor }" :class="{ active: bgcolor }">
-			<view class="cu-custom" :style="[{height:CustomBar+ 'px',}]">
-				<view class="cu-bar fixed" :style="customStyle" :class="[bgcolor]">
-					<view class="action">
-						<text class="nav-title Shop-selector-rect">{{ 'yshop商城' }}</text>
-					</view>
-					<view class="content" :style="[{top:StatusBar + 'px'}]">
+<!--		<view class="head_box " :style="{ background: bgcolor }" :class="{ active: bgcolor }">-->
+<!--			<view class="cu-custom" :style="[{height:CustomBar+ 'px',}]">-->
+<!--				<view class="cu-bar fixed" :style="customStyle" :class="[bgcolor]">-->
+<!--					<view class="action">-->
+<!--						<text class="nav-title Shop-selector-rect">{{ 'yshop商城' }}</text>-->
+<!--					</view>-->
+<!--					<view class="content" :style="[{top:StatusBar + 'px'}]">-->
 
-					</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 @click="goGoodSearch()" class="search acea-row row-middle">
@@ -382,9 +390,7 @@
 	}
 
   .head_box {
-		position: relative;
-		z-index: 10;
-		width: 100%;
+    width: 750rpx;
     // background: #fff;
     transition: all linear 0.3s;
 

utils/index.js

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