1

manifest.json

@@ -1,7 +1,7 @@
 {
-    "name" : "CRMEB标准版",
+    "name" : "猫小鱼潮玩",
     "appid" : "__UNI__A3F1ED4",
-    "description" : "CRMEB标准版",
+    "description" : "猫小鱼潮玩",
     "versionName" : "5.3.0",
     "versionCode" : 530,
     "transformPx" : false,
@@ -202,8 +202,8 @@
             "onLocationChange",
             "startLocationUpdateBackground",
             "chooseAddress"
-        ],
-        "__usePrivacyCheck__" : true
+        ]
+        // "__usePrivacyCheck__" : true
     },
     "mp-alipay" : {
         "usingComponents" : true

pages.json

@@ -22,6 +22,7 @@
 		{
 			"path": "pages/order_addcart/order_addcart",
 			"style": {
+				"navigationStyle": "custom",
 				"navigationBarTitleText": "购物车",
 				"app-plus": {
 					// #ifdef APP-PLUS
@@ -37,7 +38,7 @@
 			"path": "pages/user/index",
 			"style": {
 
-				"navigationBarTitleText": "个人中心",
+				"navigationBarTitleText": "我的",
 				"enablePullDownRefresh": true
 					// #ifdef MP || APP-PLUS
 					,

pages/goods_cate/goods_cate.vue

@@ -4,6 +4,7 @@
 		<goodsCate1 v-if="category == 1" ref="classOne" :isNew="isNew"></goodsCate1>
 		<goodsCate2 v-if="category == 2" ref="classTwo" :isNew="isNew" @jumpIndex="jumpIndex"></goodsCate2>
 		<goodsCate3 v-if="category == 3" ref="classThree" :isNew="isNew" @jumpIndex="jumpIndex"></goodsCate3>
+		<zmm-watermark></zmm-watermark>
 	</view>
 </template>
 

pages/order_addcart/order_addcart.vue

@@ -1,18 +1,25 @@
 <template>
 	<view :style="colorStyle">
+		<view class="topContent">
+			<headerSerch></headerSerch>
+		</view>
+		
 		<view class='shoppingCart copy-data' v-if="canShow">
-			<view class='labelNav acea-row row-around row-middle'>
-				<view class='item'><text class='iconfont icon-xuanzhong'></text>{{$t(`100%正品保证`)}}</view>
-				<view class='item'><text class='iconfont icon-xuanzhong'></text>{{$t(`所有商品精挑细选`)}}</view>
-				<view class='item'><text class='iconfont icon-xuanzhong'></text>{{$t(`售后无忧`)}}</view>
-			</view>
-			<view class='nav acea-row row-between-wrapper'>
-				<view>{{$t(`购物数量`)}} <text class='num font-num'>{{cartCount}}</text></view>
-				<view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0"
-					class='administrate acea-row row-center-wrapper' @click='manage'>
-					{{ footerswitch ? $t(`管理`) : $t(`取消`)}}
+			<view class="contentItem">
+				<view class='labelNav acea-row row-around row-middle'>
+					<view class='item'><text class='iconfont icon-xuanzhong'></text>{{$t(`100%正品保证`)}}</view>
+					<view class='item'><text class='iconfont icon-xuanzhong'></text>{{$t(`所有商品精挑细选`)}}</view>
+					<view class='item'><text class='iconfont icon-xuanzhong'></text>{{$t(`售后无忧`)}}</view>
+				</view>
+				<view class='nav acea-row row-between-wrapper'>
+					<view>{{$t(`购物数量`)}} <text class='num font-num'>{{cartCount}}</text></view>
+					<view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0"
+						class='administrate acea-row row-center-wrapper' @click='manage'>
+						{{ footerswitch ? $t(`管理`) : $t(`取消`)}}
+					</view>
 				</view>
 			</view>
+			
 			<view v-if="(cartList.valid.length > 0 || cartList.invalid.length > 0) && canShow ">
 				<view class='list'>
 					<checkbox-group @change="checkboxChange">
@@ -67,7 +74,7 @@
 				<view class='invalidGoods' v-if="cartList.invalid.length > 0">
 					<view class='goodsNav acea-row row-between-wrapper'>
 						<view @click='goodsOpen'><text class='iconfont'
-								:class='goodsHidden==true?"icon-xiangxia":"icon-xiangshang"'></text>{{$t(`失效商品`)}}
+						:class='goodsHidden==true?"icon-xiangxia":"icon-xiangshang"'></text>{{$t(`失效商品`)}}
 						</view>
 						<view class='del' @click='unsetCart'><text class='iconfont icon-shanchu1'></text>{{$t(`清空`)}}
 						</view>
@@ -146,6 +153,7 @@
 		<!-- <pageFooter :countNum="cartCount"></pageFooter> -->
 		<tabBar v-if="!is_diy" :pagePath="'/pages/order_addcart/order_addcart'"></tabBar>
 		<pageFooter v-else></pageFooter>
+		<zmm-watermark></zmm-watermark>
 	</view>
 </template>
 
@@ -171,6 +179,7 @@
 	import {
 		toLogin
 	} from '@/libs/login.js';
+	import headerSerch from '@/components/headerSerchCommon.vue';
 	import tabBar from "@/pages/index/visualization/components/tabBar.vue"
 	import {
 		mapGetters
@@ -191,6 +200,7 @@
 			recommend,
 			productWindow,
 			tabBar,
+			headerSerch,
 			// #ifdef MP
 			authorize
 			// #endif
@@ -973,6 +983,12 @@
 </script>
 
 <style scoped lang="scss">
+	.topContent{
+		border: 1px solid red;
+		position: fixed;
+		width: 100%;
+		top: 0;
+	}
 	.shoppingCart {
 		/* #ifdef H5 */
 		// padding-bottom: 0;
@@ -980,19 +996,25 @@
 		// padding-bottom: env(safe-area-inset-bottom);
 		/* #endif */
 	}
-
+	.contentItem{
+		position: fixed;
+		left: 0;
+		top: 130rpx;
+		z-index: 5;
+		width: 100%;
+	}
 	.shoppingCart .labelNav {
 		height: 76rpx;
 		padding: 0 30rpx;
 		font-size: 22rpx;
 		color: #8c8c8c;
-		position: fixed;
-		left: 0;
+		// position: fixed;
+		// left: 0;
 		width: 100%;
 		box-sizing: border-box;
 		background-color: #f5f5f5;
-		z-index: 5;
-		top: 0;
+		// z-index: 5;
+		// top: 130rpx;
 	}
 
 	.shoppingCart .labelNav .item .iconfont {
@@ -1008,10 +1030,10 @@
 		box-sizing: border-box;
 		font-size: 28rpx;
 		color: #282828;
-		position: fixed;
-		left: 0;
-		z-index: 5;
-		top: 76rpx;
+		// position: fixed;
+		// left: 0;
+		// z-index: 5;
+		// top: 170rpx;
 	}
 
 	.shoppingCart .nav .num {
@@ -1045,7 +1067,7 @@
 	}
 
 	.shoppingCart .list {
-		margin-top: 171rpx;
+		margin-top: 300rpx;
 	}
 
 	.shoppingCart .list .item {
@@ -1300,7 +1322,7 @@
 
 	.emptyBox {
 		text-align: center;
-		padding: 80rpx 0;
+		padding: 150rpx 0;
 
 		.tips {
 			color: #aaa;

pages/users/wechat_login/index.vue

@@ -1,7 +1,8 @@
 <template>
 	<view :style="colorStyle" class="wrapper">
 		<view class="bag">
-			<img :src="`../static/login-bg_${colorStatus}.jpg`" alt="" srcset="">
+			<!-- <img :src="`../static/login-bg_${colorStatus}.jpg`" alt="" srcset=""> -->
+			<img :src="`../../../static/images/loginBg.png`" alt="" srcset="">
 		</view>
 		<view class="system-height" :style="{ height: statusBarHeight }"></view>
 		<!-- #ifdef MP -->
@@ -12,11 +13,11 @@
 			<view class="icon" @click="home" v-else>
 				<image src="../static/home.png"></image>
 			</view>
-			{{$t(`商城登录`)}}
+			{{$t(`登录`)}}
 		</view>
 		<!-- #endif -->
 		<view class="merchant-msg">
-			<img :src="configData.wap_login_logo" />
+			<img :src="configData.wap_login_logo" mode="widthFix"/>
 			<view class="name">
 				{{configData.site_name}}
 			</view>
@@ -536,20 +537,24 @@
 			top: 0;
 			left: 0;
 			width: 100%;
-			opacity: .8;
+			// opacity: .8;
+			
+			height:100%;
 			z-index: -1;
 			/* #ifdef H5 */
 			z-index: 0;
 
 			/* #endif */
 			img {
+				// width: 100%;
+				// height: 838rpx;
+				height: 100%;
 				width: 100%;
-				height: 838rpx;
 			}
 		}
 
 		.merchant-msg {
-			padding-top: 252rpx;
+			padding-top: 152rpx;
 			display: flex;
 			justify-content: center;
 			align-items: center;
@@ -560,9 +565,9 @@
 
 			/* #endif */
 			img {
-				width: 152rpx;
-				height: 152rpx;
-				border-radius: 50%;
+				width: 304rpx;
+				height: auto;
+				// border-radius: 50%;
 			}
 
 			.name {
@@ -609,11 +614,12 @@
 		position: relative;
 		display: flex;
 		align-items: center;
-		justify-content: center;
+		justify-content: flex-start;
 		font-size: 34rpx;
 		font-weight: 500;
 		color: #333333;
 		line-height: 48rpx;
+		padding-left: 120rpx;
 	}
 
 	.icon {

uni_modules/zmm-watermark/components/zmm-watermark/zmm-watermark.vue

@@ -25,7 +25,7 @@
 		props: {
 			watermark: { //水印文字(支持html富文本)
 				type: String,
-				default: '南京仁舟科技有限公司'
+				default: '猫小鱼潮玩'
 			},
 			color: { //水印文字默认颜色
 				type: String,