Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf

http/yskApi/http.js

@@ -17,13 +17,13 @@ import infoBox from "@/commons/utils/infoBox.js"
 import go from '@/commons/utils/go.js';
 import { reject } from 'lodash';
 // 测试服
-// let baseUrl = 'https://admintestpapi.sxczgkj.cn'
+let baseUrl = 'https://admintestpapi.sxczgkj.cn'
 
 //预发布
 // let baseUrl = 'https://pre-cashieradmin.sxczgkj.cn'
 
 //正式
-let baseUrl = 'https://cashieradmin.sxczgkj.cn'
+// let baseUrl = 'https://cashieradmin.sxczgkj.cn'
 
 // 王伟本地测
 // let baseUrl = '/ww'
@@ -96,6 +96,7 @@ function commonsProcess(showLoading, httpReqCallback) {
 		// http响应码不正确
 		if (statusCode != 200 && statusCode != 204 && statusCode != 201) {
 			isShowErrorToast = true
+			data.message=data.message=='Bad credentials'?'用户名或密码错误':data.message
 			infoBox.showToast(data.message || '服务器异常')
 			return Promise.reject(bodyData) // 跳转到catch函数
 		}

pageTable/index/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="color-333 u-font-28  min-page bg-gray ">
-		<view class="fixed-top bg-fff u-flex u-p-l-30 u-row-between">
+		<!-- <view class="fixed-top bg-fff u-flex u-p-l-30 u-row-between">
 			<view class="u-flex u-flex-1 u-row-between">
 				<view class="u-flex   u-p-t-30 u-p-b-30 u-flex-1 u-row-center" @tap="showsTimesToggle">
 					<text class="u-m-r-12">{{times.list[times.active]}}秒</text>
@@ -42,7 +42,48 @@
 				<view :style="{height: status.bottomHeight+'px'}"></view>
 			</view>
 
-		</view>
+		</view> -->
+		
+		<up-sticky>
+			<view class="bg-fff u-p-l-30   u-p-b-30 u-relative">
+				<!-- <view class="myTabs ">
+				<myTabs :list="tabsList" @change="tabsChange"></myTabs>
+			</view> -->
+				<view class="input-wrapper">
+					<view class="input-main">
+						<view class="u-flex u-p-r-30 u-font-28" @click="showstatusToggle">
+							<text class="u-m-r-10 u-line-1" :class="{'color-main':status.active!=0}"
+								style="max-width: 100rpx;">{{status.list[status.active].label }}</text>
+							<up-icon name="arrow-down" size="16"></up-icon>
+						</view>
+						<uni-easyinput clearable class='jeepay-search' :inputBorder="false"
+						trim="all"
+							placeholder="搜索" v-model="search.keyword"
+							@clear="searchConfirm"
+							@confirm="searchConfirm">
+							<template #prefixIcon>
+								<image src="@/static/iconImg/icon-search.svg" class="input-icon" />
+							</template>
+						</uni-easyinput>
+						<view class="u-m-l-4">
+							<button class="" type="text" @click="searchConfirm"> <text class="color-333">搜索</text></button>
+						</view>
+					</view>
+				</view>
+				<view :style="{height:status.show?statusHeight:0}" class="tranistion status overflow-hide">
+					<view @tap="changestatusActive(index,item)" class="u-flex u-p-l-30 lh30 u-p-r-30 u-row-between"
+						v-for="(item,index) in status.list" :key="index">
+						<view>{{item.label}}</view>
+						<uni-icons v-if="status.active===index" type="checkmarkempty" :color="color.ColorMain"></uni-icons>
+					</view>
+					<view :style="{height: status.bottomHeight+'px'}"></view>
+				</view>
+		
+			</view>
+		</up-sticky>
+		
+		
+		
 
 		<view class="list u-p-30">
 			<view class="my-bg-main table-type u-flex border-r-12 color-fff ">
@@ -467,9 +508,9 @@
 	function setTimer() {
 		clearInterval(timer)
 		getData()
-		timer = setInterval(() => {
+		// timer = setInterval(() => {
-			getData()
+		// 	getData()
-		}, times.list[times.active] * 1000)
+		// }, times.list[times.active] * 1000)
 	}
 	watch(() => times.active, (newval) => {
 		setTimer()
@@ -491,6 +532,61 @@
 	.fixed-top {
 		z-index: 10;
 	}
+	.input-wrapper {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding-top: 26rpx;
+		background-color: $J-bg-ff;
+	
+		.input-main {
+			flex: 1;
+			display: flex;
+			align-items: center;
+			height: 64rpx;
+	
+			image {
+				padding: 22rpx;
+				width: 26rpx;
+				height: 26rpx;
+			}
+	
+			input {
+				flex: 1;
+				font-size: 27rpx;
+			}
+	
+			::v-deep uni-button {
+				font-size: 28rpx;
+				color: $my-main-color;
+				background: rgba(255, 255, 255, 1);
+			}
+	
+			::v-deep.uni-easyinput {
+				.uni-easyinput__content {
+					background-color: $J-bg-f5 !important;
+					border-radius: $J-b-r12;
+	
+					.uni-easyinput__content-input {
+						padding-left: 0 !important;
+	
+						.uni-input-input {
+							border-radius: $J-b-r12 !important;
+							overflow: hidden !important;
+						}
+					}
+	
+					.uni-input-placeholder {
+						font-size: 27rpx;
+					}
+	
+					.uni-icons {
+						color: rgba(230, 230, 230, 1) !important;
+					}
+				}
+			}
+		}
+	}
 
 	.table-type {
 		flex-wrap: wrap;
@@ -536,12 +632,7 @@
 	.search-box {
 		background-color: #fff;
 		padding: 16rpx 0;
-		top: 0;
-		bottom: 0;
-		position: absolute;
-		right: 30rpx;
 		display: flex;
-
 		.search-btn {
 			padding: 0 30rpx;
 			box-sizing: border-box;
@@ -570,6 +661,6 @@
 	}
 
 	.list {
-		margin-top: 52px;
+		// margin-top: 52px;
 	}
 </style>

pages/index/index.vue

@@ -2,7 +2,12 @@
 <template>
 	<JeepayBackground :bgColorStyle="{}">
 		<!-- 导航条 -->
-		<JeepayCustomNavbar title="首页" textColor="#fff" bgDefaultColor="#318AFE" />
+		<up-navbar title="首页" bg-color="#318AFE" titleStyle="color:#fff;font-size:16px;" @leftClick="toSetting">
+			<template #left>
+				<up-icon name="/static/indexImg/icon-menu.svg" color="#fff" :size="16" ></up-icon>
+			</template>
+		</up-navbar>
+		<!-- <JeepayCustomNavbar title="首页" textColor="#fff" bgDefaultColor="#318AFE"  /> -->
 		<view class="income">
 			<view>总收入</view>
 			<view>￥{{totalRevenuedata}}</view>
@@ -54,7 +59,9 @@
 	let totalRevenue= (d)=>{
 		totalRevenuedata.value=d
 	}
-	
+	function toSetting(){
+		go.to('PAGES_SHOP_SETUP')
+	}
 	// 导航列表
 	const navList = [
 		// {
@@ -143,16 +150,16 @@
 		// 	icon: '/static/indexImg/icon-staff.svg',
 		// 	pageUrl: 'PAGES_USER'
 		// },
-		{
+		// {
-			title: '订阅通知',
+		// 	title: '订阅通知',
-			icon: '/static/indexImg/icon-notification.svg',
+		// 	icon: '/static/indexImg/icon-notification.svg',
-			pageUrl: 'PAGES_NOTIFICATION_INDEX',
+		// 	pageUrl: 'PAGES_NOTIFICATION_INDEX',
-		},
+		// },
-		{
+		// {
-			title: '设置中心',
+		// 	title: '设置中心',
-			icon: '/static/indexImg/icon-cashier.svg',
+		// 	icon: '/static/indexImg/icon-cashier.svg',
-			pageUrl: 'PAGES_SHOP_SETUP',
+		// 	pageUrl: 'PAGES_SHOP_SETUP',
-		},
+		// },
 		// {
 		// 	title: '优惠券',
 		// 	icon: '/static/coupon/icon_coupon.svg',
@@ -332,6 +339,12 @@
 
 <style lang="scss" scoped>
 	.income {
+		/* #ifdef MP-WEIXIN */
+		padding-top: calc(84rpx + 44px);
+		/* #endif */
+		/* #ifdef H5 */
+		padding-top: calc(84rpx);
+		/* #endif */
 		>view {
 			text-align: center;
 			color: #FFFFFF;

static/indexImg/icon-menu.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="17.471" height="14.049" viewBox="0 0 17.471 14.049"><defs><style>.a{fill:#fff;}</style></defs><path class="a" d="M16.406,114.232H32.083a.874.874,0,1,0,0-1.747H16.406a.874.874,0,1,0,0,1.747ZM32.083,118.6H16.406a.874.874,0,1,0,0,1.747H32.083a.874.874,0,1,0,0-1.747Zm0,6.187H16.406a.874.874,0,1,0,0,1.747H32.083a.874.874,0,1,0,0-1.747Zm0,0" transform="translate(-15.509 -112.485)"/></svg>