Merge remote-tracking branch 'origin/master'

components/tabbar_cjx.vue

@@ -39,10 +39,7 @@
 				selectedIndex: 4,
 				// 自定义 tab 数据
 				items: [
-					{
-						text: '扫码记录',
-						icon: 'scan.png'
-					},
+					
 					{
 						text: '溯源信息',
 						icon: 'traceability.png'
@@ -55,6 +52,11 @@
 						text: '公司简介',
 						icon: 'company.png'
 					},
+					{
+						text: '个人中心',
+						icon: 'my.png'
+					},
+					
 
 				]
 			};
@@ -121,16 +123,16 @@
 				let url = '';
 				switch (index) {
 					case 0:
-						url = '/pages/cjx/record/record';
-						break;
-					case 1:
 						url = '/pages/cjx/traceability/traceability';
 						break;
-					case 2:
+					case 1:
 						url = '/pages/cjx/feedback/feedback';
 						break;
-					case 3:
+					case 2:
 						url = '/pages/cjx/introduction/introduction';
+						break;	
+					case 3:
+						url = '/pages/cjx/my/my';
 						break;
 					default:
 						break;

manifest.json

@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx67fbe90ca1db0372",
+        "appid" : "wx54eda1bf87ce7d03",
         "setting" : {
             "urlCheck" : false,
             "minified" : true

pages.json

@@ -167,7 +167,16 @@
 			"path" : "pages/cjx/index/authCode",
 			"style" : 
 			{
-				"navigationBarTitleText" : ""
+				"navigationBarTitleText" : "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path" : "pages/cjx/my/my",
+			"style" : 
+			{
+				"navigationBarTitleText" : "",
+				"navigationStyle": "custom"
 			}
 		}
 		

pages/cjx/feedback/feedback.vue

@@ -264,7 +264,7 @@
 	}
 
 	.content {
-		height: 65vh;
+		height: 69vh;
 		overflow: auto;
 		margin: 0 32rpx;
 		padding: 32rpx 24rpx 24rpx 24rpx;

pages/cjx/index/rules.vue

@@ -80,19 +80,17 @@
 
 			</view>
 		</view>
-		<CustomTabbar />
+
 	</view>
 </template>
 
 <script>
-	import CustomTabbar from '@/components/tabbar_cjx.vue';
+	
 	import {
 		getRule
 	} from '@/api/scan'
 	export default {
-		components: {
-			CustomTabbar
-		},
+
 		data() {
 			return {
 				scanCode: '',
@@ -129,6 +127,10 @@
 <style>
 	@import url('../../../static/scss/common_cjx.css');
 
+	.cardTop{
+		background-image:
+			url("https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/hdgz.png");
+	}
 	.row-class {
 		height: 80rpx;
 	}

pages/cjx/record/record.vue

@@ -253,7 +253,7 @@
 	}
 
 	.detail {
-		background-image: url("https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/guzhenganzi/detailImg.png");
+		background-image: url("https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/detailImg.png");
 		background-size: cover;
 		/* 确保背景图片自适应填充整个容器 */
 		background-position: inherit;

pages/cjx/traceability/traceability.vue

@@ -104,7 +104,7 @@
 						<view class="item-left item-text">生产厂址</view>
 					</u-col>
 					<u-col span="8">
-						<view class="item-text">湖南省娄底市新化县</view>
+						<view class="item-text">湖南湘潭市湘潭县</view>
 					</u-col>
 				</u-row>
 			</view>
@@ -254,7 +254,7 @@
 		color: #FFFFFF;
 	}
 	.content {
-		height: 68vh;
+		height: 69vh;
 		border-radius: 10rpx;
 		margin: 0rpx 40rpx;
 		padding: 10rpx 24rpx;

pages/login.vue

@@ -58,7 +58,6 @@
  								}
  							})
  						} else {
-
  							console.log('登录失败！' + res.errMsg);
  						}
  					},

static/scss/common_cjx.css

@@ -80,7 +80,7 @@
 }
 
 .content_text{
-	height: calc(100% - 190rpx);
+	height: calc(100% - 200rpx);
 	overflow: auto;
 }