1

App.vue

@@ -47,4 +47,5 @@
 	.C929297{color: #929297 !important;}
 	.C0178FD{background-color:#0178FD !important;}
 	/deep/ .uni-tabbar-border{background: #212121 !important;}
+	/deep/ .uni-tabbar{background-color: #1B1B1B !important;}
 </style>

components/helang-pickerColor/helang-pickerColor.vue

@@ -0,0 +1,135 @@
+<template>
+	<view v-show="isShow">
+		<view class="shade" @tap="hide"></view>
+		<view class="pop">
+			<view class="flex_col" style="margin-bottom: 20upx;">
+				<view class="preview" :style="{'backgroundColor':pickerColor}"></view>
+				<view class="value">
+					<text style="color: black;" v-if="pickerColor">颜色值：{{pickerColor}}</text>
+				</view>
+				<view class="ok" @tap="setColor">确定</view>
+			</view>
+			<view class="list flex_col" v-for="(item,index) in colorArr" :key="index">
+				<view v-for="(v,i) in item" :key="i" 
+					:style="{'backgroundColor':v}" 
+					:data-color="v" 
+					:data-index="index" 
+					:data-i="i" 
+					:class="{'active':(index==pickerArr[0] && i==pickerArr[1])}"
+					@tap="picker"></view>
+			</view>
+			<view :style="{'height':(bottom+'px')}"></view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:'picker-color',
+		props:{
+			isShow: {
+				type: Boolean,
+				default: false, 
+			},
+			bottom:{
+				type: Number,
+				default: 0, 
+			}
+		},
+		data() {
+			return {
+				colorArr:[
+					['#000000','#111111','#222222','#333333','#444444','#666666','#999999','#CCCCCC','#EEEEEE','#FFFFFF'],
+					['#ff0000','#ff0033','#ff3399','#ff33cc','#cc00ff','#9900ff','#cc00cc','#cc0099','#cc3399','#cc0066'],
+					['#cc3300','#cc6600','#ff9933','#ff9966','#ff9999','#ff99cc','#ff99ff','#cc66ff','#9966ff','#cc33ff'],
+					['#663300','#996600','#996633','#cc9900','#a58800','#cccc00','#ffff66','#ffff99','#ffffcc','#ffcccc'],
+					['#336600','#669900','#009900','#009933','#00cc00','#66ff66','#339933','#339966','#009999','#33cccc'],
+					['#003366','#336699','#3366cc','#0099ff','#000099','#0000cc','#660066','#993366','#993333','#800000']
+				],
+				pickerColor:'',
+				pickerArr:[-1,-1]
+			};
+		},
+		methods: {
+			picker(e) {
+				let data=e.currentTarget.dataset;
+				this.pickerColor=data.color;
+				this.pickerArr=[data.index,data.i];
+			},
+			hide(){
+				this.$emit("callback",'');
+			},
+			setColor(){
+				this.$emit("callback",this.pickerColor);
+			}
+		},
+		
+	}
+</script>
+
+<style scoped>
+.shade{
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	background-color: rgba(0,0,0,0.5);
+	z-index: 99;
+}
+.pop{
+	position: fixed;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	background-color: #fff;
+	z-index: 100;
+	padding: 20upx 20upx 10upx 20upx;
+	font-size: 32upx;
+}
+.flex_col{
+	display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    align-items: center;
+    align-content: center;
+}
+.list{
+    justify-content: space-between;
+}
+.list>view{
+	width: 60upx;
+	height: 60upx;
+	margin-bottom: 10upx;
+	box-sizing: border-box;
+	border-radius: 3px;
+	box-shadow: 0 0  2px #ccc;
+}
+.list .active{
+	box-shadow: 0 0  2px #09f;
+	transform:scale(1.05,1.05);
+}
+.preview{
+	width: 180upx;
+	height: 60upx;
+}
+.value{
+	margin: 0 40upx;
+	flex-grow: 1;
+}
+.ok{
+	width: 160upx;
+	height: 60upx;
+	line-height: 60upx;
+	text-align: center;
+	background-color: #ff9933;
+	color: #fff;
+	border-radius: 4px;
+	letter-spacing: 3px;
+	font-size: 32upx;
+}
+.ok:active{
+	background-color: rgb(255, 107, 34);
+}
+</style>

pages.json

@@ -379,8 +379,8 @@
         }
     ],
 	"tabBar": {
-		"color": "#999",
-		"selectedColor": "#82cfd5",
+		"color": "#8E8E93",
+		"selectedColor": "#0178FD",
 		"borderStyle": "#fff",
 		"backgroundColor": "white",
 		"iconfontSrc": "static/icon/iconfont.ttf",

pages/baocun/index.vue

@@ -177,7 +177,7 @@ export default {
 					uni.navigateBack({
 						delta: 1,
 						success: function() {
-							beforePage.$vm.initshow()
+							beforePage.$vm.shuaxin()
 						}
 					});
 					that.$refs.toast.show({model:'success',label:res.data.msg})
@@ -270,7 +270,7 @@ export default {
 						uni.navigateBack({
 							delta: 1,
 							success: function() {
-								beforePage.$vm.initshow()
+								beforePage.$vm.shuaxin()
 							}
 						});
 					},2000)

pages/chengyuan/index.vue

@@ -86,11 +86,6 @@ export default {
 				url: "/pages/luru/index",
 			})
 		},
-		quindex(){
-			uni.navigateTo({
-				url: "/pages/index/index",
-			})
-		},
 		tijiao(){
 			var that=this;
 			if(this.reqData.username==""){

pages/chuanghome/index.vue

@@ -91,6 +91,7 @@
 					</view>
 				</view>
 			</tm-sheet>
+			<tm-dialog @confirm="querentm" :inputVala="inputVala" confirmText="确定" :showCancel="false" model="confirm" v-model="show3" content="请确认条码内容是否正确" theme="split"></tm-dialog>
 		</div>
 		<!-- 弹出层消息 -->
 		<tm-message ref="toast"></tm-message>
@@ -101,6 +102,8 @@ import{myRequest} from '@/api/request.js'
 export default {
 	data() {
 		return {
+			show3:false,
+			inputVala:'',
 			shencaiList:[
 				{title:"梨形",id:21},
 				{title:"标准",id:31},
@@ -146,7 +149,7 @@ export default {
 			})
 		},
 		quindex(){
-			uni.navigateTo({
+			uni.switchTab({
 				url: "/pages/index/index",
 			})
 		},
@@ -212,6 +215,11 @@ export default {
 			}
 			return ''
 		},
+		querentm(e){
+			console.log(e)
+			this.reqData.wardrode_no=e;
+			this.active=2;
+		},
 		saoma(){
 			var that=this;
 			uni.scanCode({
@@ -219,8 +227,8 @@ export default {
 				success: function (res) {
 					console.log('条码类型：' + res.scanType);
 					console.log('条码内容：' + res.result);
-					that.reqData.wardrode_no=res.result;
-					that.active=2;
+					that.inputVala=res.result;
+					that.show3=true;
 				},
 				error : function(e) {
 					alert("网络异常，请重试");

pages/dapei/index.vue

@@ -110,7 +110,6 @@ export default {
 			this.activeIndex1=0;
 			this.page=1;
 			this.getFl();
-			this.touFun();
 		},
 		fenlei(e){
 			var id=this.listflall[e].id;

pages/login/index.vue

@@ -72,7 +72,7 @@ export default {
 					uni.setStorageSync("family_id",res.data.data.family_id)
 					that.$refs.toast.show({model:'success',label:res.data.msg})
 					setTimeout(function(){
-						uni.navigateTo({
+						uni.switchTab({
 							url: "/pages/index/index",
 						})
 					},2000)

pages/luru/index.vue

@@ -31,9 +31,20 @@
 						<!-- <tm-pickers v-for="item in arrbig" class="tan" :default-value.sync="item.choosevalue" rang-key="category_name" list="[]">
 							<tm-input title="分类" placeholder="请选择分类" disabled :value="obTstrnew(category_danarr,'')" right-icon="icon-angle-right"></tm-input>
 						</tm-pickers> -->
-						<tm-pickers v-for="(item,index) in arrbig" @confirm="xuanze" :indexfu="index" :list="item.value">
-							<tm-input title="分类" placeholder="请选择分类" v-model="item.choosename" disabled right-icon="icon-angle-right"></tm-input>
-						</tm-pickers>
+						<view v-for="(item,index) in arrbig">
+							<tm-pickers v-if="item.type=='select'"  @confirm="xuanze" :indexfu="index" :list="item.value">
+								<tm-input :title="item.name" align="right" :placeholder="'请选择'+item.name" v-model="item.choosevalue" disabled right-icon="icon-angle-right"></tm-input>
+							</tm-pickers>
+							<tm-input v-if="item.type=='text' && item.name !='颜色'" :title="item.name" v-model="item.value" disabled align="right"></tm-input>
+							<view class="border-b-0 border-grey-darken-4-b-1 py-24 flex-between" v-if="item.name=='颜色'">
+								<text class="text-size-n ">{{item.name}}</text>
+								<view>
+									<view  class="seka" :style="{'backgroundColor':buttonColor}" @tap="showPickerColorPop"></view>
+									<picker-color :isShow="showPickerColor" :bottom="bottomPickerColor"  @callback='getPickerColor' />
+								</view>
+							</view>
+						</view>
+						
 						<!-- <tm-listitem
 							v-for="item in arrbig"
 							:left-icon-size="80"
@@ -58,7 +69,6 @@
 						<tm-input title="适用人群" v-model="reqData.type" align="right"></tm-input>
 						<tm-input title="品牌" v-model="reqData.brand" align="right"></tm-input>
 						<tm-input title="材料" v-model="reqData.science" align="right"></tm-input> -->
-						
 					</view>
 					<tm-button :round="24" class="sao mb-40 mt-40" @click="chuangjianFun()" block>提交</tm-button>
 				</view>
@@ -86,12 +96,19 @@
 <script>
 import{myRequest} from '@/api/request.js'
 import { pathToBase64, base64ToPath } from '@/js_sdk/mmmm-image-tools/index.js'
+import pickerColor from "@/components/helang-pickerColor/helang-pickerColor.vue"
 export default {
+	components: {
+		"picker-color":pickerColor,
+	},
 	data() {
 		return {
+			buttonColor:"#0099FF",
+			showPickerColor:false,
+			bottomPickerColor:0,
 			arrbig:[],
 			koutu:'/static/img/53.png',
-			active:2,
+			active:0,
 			category_arr:[],
 			category_danarr:[],
 			size_arr:[
@@ -130,11 +147,27 @@ export default {
 		this.jiaobenFun()
 	},
 	methods: {
+		/* 显示获取颜色选择弹窗 */
+		showPickerColorPop(){
+			this.showPickerColor=true;
+		},
+		/* 获取颜色选择回调 */
+		getPickerColor(color){
+			/* 隐藏弹窗 */
+			this.showPickerColor=false;
+			/* 判断颜色值是否有效 */
+			if(color){
+				this.buttonColor=color;
+				console.log('选择的颜色值是：'+color);
+			}
+		},
+		showPickerColorPop(){
+			this.showPickerColor=true;
+		},
 		xuanze(data){
-			var index=data[0].index;
+			// var index=data[0].index;
 			// this.arrbig[index].choosename=data[0].data;
-			console.log(data[0].data)
-			console.log(this.arrbig)
+			console.log(data)
 		},
 		getFl(){
 			var that=this;
@@ -190,8 +223,8 @@ export default {
 			this.active=1;
 		},
 		quindex(){
-			uni.navigateTo({
-				url: "/pages/index/index?index=1",
+			uni.switchTab({
+				url: "/pages/wardrobe/index",
 			})
 		},
 		paizhao(){
@@ -226,7 +259,10 @@ export default {
 				console.log(res.data)
 				if (res.data.code == 200) {
 					var arrbig=[
-						{name:"颜色",value:["白色","绿色","蓝色"],choosevalue:'',choosename:''}
+						{name:"名称",value:"羽绒服",choosevalue:'',type:'text'},
+						{name:"颜色",value:"#b1b1b1",choosevalue:'',type:'text'},
+						{name:"尺码",value:["S","L","M"],choosevalue:'L',type:'select'},
+						{name:"材质",value:["牛仔","纯棉","羊毛"],choosevalue:'纯棉',type:'select'}
 					]
 					that.arrbig=arrbig;
 					that.active=2;
@@ -348,4 +384,5 @@ export default {
 	.logincla{margin-top: 100px;}
 	/deep/ .logincla .primary{background-color: #303440 !important;}
 	/deep/ .quindex uni-button{background-color: #0A84FF !important;}
+	.seka{width: 40px;height: 20px;}
 </style>

pages/qiehuan/index.vue

@@ -82,10 +82,11 @@ export default {
 				if (res.data.code == 200) {
 					let pages = getCurrentPages(); // 当前页面
 					let beforePage = pages[pages.length - 2]; // 前一个页面
+					console.log(beforePage)
 					uni.navigateBack({
 						delta: 1,
 						success: function() {
-							beforePage.$vm.initBtn()
+							beforePage.$vm.qingkong()
 						}
 					});
 				}else{

pages/user/index.vue

@@ -61,7 +61,7 @@ import{myRequest} from '@/api/request.js'
 export default {
 	data() {
 		return {
-			show:false,
+			show:true,
 			on:true,
 			libiaoList:[
 			{title:'我的钱包',type:'1'},

tm-vuetify/components/tm-dialog/tm-dialog.vue

@@ -18,7 +18,7 @@
 							<view >
 								<text :class="[black_tmeme ? 'text-white' : 'text-grey-darken-3']">{{ content }}</text>
 								<view v-if="model == 'confirm'" class="pt-24">
-									<tm-input bg-color="grey-lighten-5" @input="suren" :black="black_tmeme" v-model="inputValSd" :border-bottom="false" :flat="true"></tm-input>
+									<tm-input bg-color="grey-lighten-5" @input="suren" :black="black_tmeme" v-model="inputVala" :border-bottom="false" :flat="true"></tm-input>
 								</view>
 							</view>
 						</slot>
@@ -172,6 +172,10 @@ export default {
 			type: String,
 			default: ''
 		},
+		inputVala:{
+			type: String,
+			default: ''
+		},
 		// 样式。
 		theme: {
 			type: String,
@@ -228,7 +232,6 @@ export default {
 	},
 	data() {
 		return {
-			inputValSd: '',
 			sysinfo: 0,
 			clickOverlay: false
 		};
@@ -271,12 +274,12 @@ export default {
 		},
 		confirmClick() {
 			if (this.model == 'confirm') {
-				if (!this.inputValSd) {
+				if (!this.inputVala) {
 					uni.$tm.toast('请输入内容');
 					this.anifeed();
 					return;
 				}
-				this.$emit('confirm', this.inputValSd);
+				this.$emit('confirm', this.inputVala);
 			} else {
 				this.$emit('confirm');
 			}
@@ -285,7 +288,7 @@ export default {
 			}
 		},
 		suren(e) {
-			this.$emit('update:inputVal', this.inputValSd);
+			this.$emit('update:inputVal', this.inputVala);
 		},
 		concelClick() {
 			this.$emit('concel');//错误的拼写兼容

tm-vuetify/components/tm-pickers/tm-pickers.vue

@@ -162,7 +162,7 @@
 		},
 		methods: {
 			confirm() {
-				console.log(this.indexfu)
+				// console.log(this.indexfu)
 				if(!this.aniisTrue){
 					console.log('no');
 					return ;
@@ -171,7 +171,8 @@
 				
 				let saray = [];
 				sdata.forEach(item=>{
-					saray.push(item.data)
+					var obj={data:item.data,index:this.indexfu}
+					saray.push(obj)
 				})
 				this.$emit('confirm',sdata)
 				this.$emit('update:defaultValue',saray)

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/1a5d4ba0-744f-11ed-9b3f-8b151babd661
+https://ide.dcloud.net.cn/build/download/425c2360-7de6-11ed-93ad-29c0c5cad2df

unpackage/cache/certdata

@@ -1,3 +1,3 @@
-andrCertfile=D:/yzm/exe/HBuilderX.3.4.7.20220422/HBuilderX/plugins/app-safe-pack/Test.keystore
-andrCertAlias=android
-andrCertPass=ep/Tdjka4Y7WYqDB6/S7dw==
+andrCertfile=C:/Users/Administrator/Desktop/cafeaad6cfee4e39a4f466ebc435531d.keystore
+andrCertAlias=kaifayzm
+andrCertPass=MaYZh/M+ydStkr3uVFXcIQ==