图标更新

src/assets/icon/demo_index.html

@@ -31,6 +31,24 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe609;</span>
+                <div class="name">日历</div>
+                <div class="code-name">&amp;#xe609;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe616;</span>
+                <div class="name">分类</div>
+                <div class="code-name">&amp;#xe616;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe656;</span>
+                <div class="name">全屏</div>
+                <div class="code-name">&amp;#xe656;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe686;</span>
                 <div class="name">扫描 识别 380%</div>
                 <div class="code-name">&amp;#xe686;</div>
@@ -399,6 +417,33 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-rili"></span>
+            <div class="name">
+              日历
+            </div>
+            <div class="code-name">.icon-rili
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-fenlei"></span>
+            <div class="name">
+              分类
+            </div>
+            <div class="code-name">.icon-fenlei
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-quanping"></span>
+            <div class="name">
+              全屏
+            </div>
+            <div class="code-name">.icon-quanping
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-saomiaoshibie380"></span>
             <div class="name">
               扫描 识别 380%
@@ -906,6 +951,30 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-rili"></use>
+                </svg>
+                <div class="name">日历</div>
+                <div class="code-name">#icon-rili</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fenlei"></use>
+                </svg>
+                <div class="name">分类</div>
+                <div class="code-name">#icon-fenlei</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-quanping"></use>
+                </svg>
+                <div class="name">全屏</div>
+                <div class="code-name">#icon-quanping</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-saomiaoshibie380"></use>
                 </svg>
                 <div class="name">扫描 识别 380%</div>

src/assets/icon/iconfont.json

@@ -6,6 +6,27 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "1391282",
+      "name": "日历",
+      "font_class": "rili",
+      "unicode": "e609",
+      "unicode_decimal": 58889
+    },
+    {
+      "icon_id": "5204808",
+      "name": "分类",
+      "font_class": "fenlei",
+      "unicode": "e616",
+      "unicode_decimal": 58902
+    },
+    {
+      "icon_id": "2678622",
+      "name": "全屏",
+      "font_class": "quanping",
+      "unicode": "e656",
+      "unicode_decimal": 58966
+    },
+    {
       "icon_id": "772252",
       "name": "扫描 识别 380%",
       "font_class": "saomiaoshibie380",

src/components/Login.vue

@@ -58,8 +58,8 @@
 export default {
 	data() {
 		return {
-			username: '',
-			pass: '',
+			username: 'admin',
+			pass: 'hyl123456',
 			cState: true
 		}
 	},

src/pages/symanger/farmThing/harvest.vue

@@ -357,6 +357,7 @@ export default {
 			this.$nextTick(() => {
 				new QRCode(this.$refs.QRcodeShowImg, {
 					text: 'http://39.106.113.84:8000/tracehome#/tracebackDetailApp/' + backcode,
+					// text: 'http://192.168.1.12:8000/tracehome#/tracebackDetailApp/' + backcode,
 					width: 200,
 					height: 200,
 					colorDark: '#333333', //二维码颜色

src/pages/symanger/resultInfo/resultInfoList.vue

@@ -226,6 +226,7 @@ export default {
 			this.$nextTick(() => {
 				new QRCode(this.$refs.QRcodeShowImg, {
 					text: 'http://39.106.113.84:8000/tracehome#/tracebackDetailApp/' + backcode,
+					// text: 'http://192.168.1.12:8000/#/tracebackDetailApp/' + backcode,
 					width: 200,
 					height: 200,
 					colorDark: '#333333', //二维码颜色

src/pages/symanger/resultInfo/tracebackDetail.vue

@@ -29,17 +29,17 @@
 					<el-card class="box-card">
 						<div class="synopsis">
 							<div class="synopsisItem">
-								<i class="iconfont icon-zhuti_tiaosepan_o"></i>
+								<i class="iconfont icon-fenlei"></i>
 								<p>品种</p>
 								<div>{{ pinfo.pickname }}</div>
 							</div>
 							<div class="synopsisItem">
-								<i class="iconfont icon-zhuti_tiaosepan_o"></i>
+								<i class="iconfont icon-jidi"></i>
 								<p>产地</p>
 								<div>{{ pinfo.farm + '/' + pinfo.land }}</div>
 							</div>
 							<div class="synopsisItem">
-								<i class="iconfont icon-zhuti_tiaosepan_o"></i>
+								<i class="iconfont icon-rili"></i>
 								<p>采收时间</p>
 								<div>{{ (pinfo.picktime * 1000) | formatTime }}</div>
 							</div>
@@ -247,7 +247,7 @@ export default {
 					obj.farmaddr && obj.farmaddr.split(';')[0].split(',')[0]
 				this.center.lat =
 					obj.farmaddr && obj.farmaddr.split(';')[0].split(',')[1]
-				obj.productphoto = obj.productphoto ? `/${obj.productphoto}` : '' //图片地址
+				obj.productphoto = obj.productphoto ? obj.productphoto : '' //图片地址
 				this.pinfo = obj
 
 				//地块地图定位

src/pages/symanger/resultInfo/tracebackDetailApp.vue

@@ -50,15 +50,11 @@
 							<template slot="title">
 								<div>
 									<span>
-										<i class="iconfont icon-zhuti_tiaosepan_o leftIcon"></i>
+										<i class="iconfont icon-jidi leftIcon"></i>
 									</span>
 									基地信息
 								</div>
 							</template>
-							<!-- <div class="baseTitle">
-								<i class="iconfont icon-zhuti_tiaosepan_o"></i
-								><strong>基地</strong>
-							</div> -->
 							<div class="baseInfo">
 								<div>　负责人：{{ pinfo.user }}</div>
 								<div>基地面积：{{ pinfo.farmarea }}亩</div>
@@ -75,7 +71,7 @@
 							<template slot="title">
 								<div>
 									<span>
-										<i class="iconfont icon-zhuti_tiaosepan_o leftIcon"></i>
+										<i class="iconfont icon-tupian-xianxing leftIcon"></i>
 									</span>
 									成长相册
 								</div>
@@ -113,7 +109,7 @@
 							<template slot="title">
 								<div>
 									<span>
-										<i class="iconfont icon-zhuti_tiaosepan_o leftIcon"></i>
+										<i class="iconfont icon-suyuan leftIcon"></i>
 									</span>
 									成长档案
 								</div>
@@ -196,7 +192,7 @@ export default {
 					break
 				case '3':
 					return '灌溉'
-					break
+					break	
 				case '4':
 					return '喷药'
 					break
@@ -263,11 +259,15 @@ export default {
 				})
 			}).then((res) => {
 				let obj = res.data
-				obj.productphoto = obj.productphoto ? `/${obj.productphoto}` : '' //图片地址
+				obj.productphoto = obj.productphoto ? obj.productphoto : '' //图片地址
 				let lng = obj.farmaddr && obj.farmaddr.split(';')[0].split(',')[0]
 				let lat = obj.farmaddr && obj.farmaddr.split(';')[0].split(',')[1]
+
 				this.formatAddress(lng, lat, obj)
-			})
+			}).catch(function (error) {
+
+			});
+
 		},
 		//经纬度转换
 		formatAddress(lng, lat, obj) {