代码优化

uniapp/uni-app/claim/pages/collage/list.vue

@@ -16,7 +16,7 @@
 			<view class="flex-x-between mt-md pd-lg">
 				<block v-for="(item,index) in collageList" :key="index">
 					<view class="flex-center flex-column">
-						<image class="collage-icon" :src="`/static/image/farm/${item.img}.png`"></image>
+						<image class="collage-icon" :src="`/claim/static/image/farm/${item.img}.png`"></image>
 						<view class="f-caption mt-sm">
 							<text space="ensp" decode="emsp"
 								style="word-break:break-all;color:#899E95">{{item.text}}</text>

uniapp/uni-app/claim/pages/order/breed/list.vue

@@ -35,7 +35,7 @@
 		<view class="space-footer"></view>
 		<view class="space-max-footer"></view>
 		<view class="footer-btn fix pl-lg pr-lg fill-base" v-if="list.count > 0">
-			<image mode="aspectFill" lazy-load class="cart-img abs" src="/static/image/farm/breed-cart.png"></image>
+			<image mode="aspectFill" lazy-load class="cart-img abs" src="/claim/static/image/farm/breed-cart.png"></image>
 			<view class="cart-msg flex-center c-base f-icontext abs" :style="{width: list.count<10 ? '30rpx' : '50rpx'}"
 				v-if="list.count">
 				{{list.count < 100 ? list.count : '99+'}}

uniapp/uni-app/claim/pages/order/collage/detail.vue

@@ -21,11 +21,11 @@
 			<view class="mt-md pd-lg flex-center flex-column fill-base radius-16">
 				<view class="space-md"></view>
 				<view class="flex-center">
-					<image lazy-load class="tag-img mr-lg" src="/static/image/farm/tag.png"></image>
+					<image lazy-load class="tag-img mr-lg" src="/claim/static/image/farm/tag.png"></image>
 					<view class="f-md-title text-bold" :style="{color:primaryColor}">
 						{{detail.status==1?`还差${detail.surplus_num}人, 成团立享超值优惠`:statusType[detail.status].title}}
 					</view>
-					<image lazy-load class="tag-img ml-lg" src="/static/image/farm/tag.png"></image>
+					<image lazy-load class="tag-img ml-lg" src="/claim/static/image/farm/tag.png"></image>
 				</view>
 				<block v-if="detail.status==1">
 					<view class="user-list flex-center mt-lg mb-md">

uniapp/uni-app/claim/pages/order/detail.vue

@@ -19,7 +19,7 @@
 		<view class="order-status-info flex-warp ml-lg mr-lg pt-lg pb-lg fill-base rel radius-24">
 			<view class="status-item flex-center flex-column" v-for="(item,index) in statusList" :key="index">
 				<image mode="aspectFill" lazy-load class="status-img radius"
-					:src="`/static/image/farm/${detail.pay_type*1+1 > item.pay_type ? item.img_name + '-fill' : item.img_name}.png`">
+					:src="`/claim/static/image/farm/${detail.pay_type*1+1 > item.pay_type ? item.img_name + '-fill' : item.img_name}.png`">
 				</image>
 				<view class="f-icontext c-caption mt-sm"
 					:style="{color:detail.pay_type*1+1>item.pay_type ? primaryColor : ''}">{{item.title}}</view>

uniapp/uni-app/farmer/pages/apply.vue

@@ -92,9 +92,9 @@
 			</view>
 			<view class="flex-between" style="width: 626rpx;margin: 0 auto;">
 				<upload @upload="imgUpload" :imagelist="subForm.idcard_imgs" imgtype="idcard_imgs" imgclass="md"
-					text="身份证正面照" :imgsize="1" bgimg="/static/image/farm/idcard.png"></upload>
+					text="身份证正面照" :imgsize="1" bgimg="/farmer/static/image/farm/idcard.png"></upload>
 				<upload @upload="imgUpload" :imagelist="subForm.idcard_imgs_fan" imgtype="idcard_imgs_fan" imgclass="md"
-					text="身份证反面照" :imgsize="1" bgimg="/static/image/farm/idcard_fan.png"></upload>
+					text="身份证反面照" :imgsize="1" bgimg="/farmer/static/image/farm/idcard_fan.png"></upload>
 			</view>
 			<view class="flex-between pb-lg f-caption c-caption" style="width: 626rpx;margin: 0 auto;">
 				<view class="flex-center" style="width: 292rpx;">身份证正面照</view>

uniapp/uni-app/land/pages/order/detail.vue

@@ -19,7 +19,7 @@
 		<view class="order-status-info flex-warp ml-lg mr-lg pt-lg pb-lg fill-base rel radius-24">
 			<view class="status-item flex-center flex-column" v-for="(item,index) in statusList" :key="index">
 				<image mode="aspectFill" lazy-load class="status-img radius"
-					:src="`/static/image/farm/${item.img_name}-fill.png`">
+					:src="`/land/static/image/farm/${item.img_name}-fill.png`">
 				</image>
 				<view class="f-icontext c-caption mt-sm" :style="{color:primaryColor}">{{item.title}}</view>
 			</view>

uniapp/uni-app/manifest.json

@@ -10,7 +10,7 @@
     },
     /* 快应用特有相关 */
     "mp-weixin" : {
-        "appid" : "wx368f6e85110430b7",
+        "appid" : "wxdf3c70a7ad38c309",
         "setting" : {
             "urlCheck" : false,
             "postcss" : true,

uniapp/uni-app/pages/mine.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="pages-mine" v-if="mineInfo.id">
+    <view class="pages-mine">
 		<uni-nav-bar :fixed="true" :shadow="false" :statusBar="true" title="我的" :color="color"
 			:backgroundColor="color == '#ffffff' ?``:`#ffffff`">
 		</uni-nav-bar>
@@ -16,12 +16,12 @@
 				</view>
 			</auth>
 			<view class="rel pt-md pl-lg pr-lg pb-lg flex-center" v-else>
-				<image mode="aspectFill" lazy-load class="mt-md avatar radius" :src="userInfo.avatarUrl"></image>
+            <image mode="aspectFill" lazy-load class="mt-md avatar radius" :src="userInfo && userInfo.avatarUrl ? userInfo.avatarUrl : '/static/image/mine/default-user.png'"></image>
 				<view class="flex-1 ml-md">
 					<view class="flex-center mb-lg">
 						<view class="flex-1 flex-center f-lg-title c-base text-bold">
 							<view class="mr-sm max-400 ellipsis">
-								{{ userInfo.nickName || `用户${userInfo.id}` }}
+                            {{ (userInfo && userInfo.nickName) || (userInfo && userInfo.id ? `用户${userInfo.id}` : '游客') }}
 							</view>
 							<!-- #ifdef APP-PLUS -->
 							<view class="flex-1"></view>
@@ -56,14 +56,14 @@
 		</block>
 
 		<view class="pt-md pl-lg pr-lg pb-lg flex-center" v-if="user_type == 2">
-			<image mode="aspectFill" lazy-load class="avatar radius" :src="farmer_info.cover">
+            <image mode="aspectFill" lazy-load class="avatar radius" :src="farmer_info && farmer_info.cover ? farmer_info.cover : '/static/image/mine/default-user.png'">
 			</image>
 			<view class="flex-1 ml-md">
-				<view class="f-lg-title c-base text-bold ellipsis" style="max-width: 520rpx;">{{farmer_info.title}}
+                <view class="f-lg-title c-base text-bold ellipsis" style="max-width: 520rpx;">{{(farmer_info && farmer_info.title) || '未填写店铺名称'}}
 				</view>
 				<view class="flex-warp f-paragraph c-base">
 					<i class="iconfont icon-dingwei mr-sm" style="font-size: 28rpx;margin-top: 6rpx;"></i>
-					<view class="ellipsis-2" style="max-width: 490rpx;">{{farmer_info.address}}</view>
+                    <view class="ellipsis-2" style="max-width: 490rpx;">{{(farmer_info && farmer_info.address) || '未填写地址'}}</view>
 				</view>
 			</view>
 		</view>
@@ -84,26 +84,26 @@
 
 		<!-- 地主/农场主 -->
 		<!-- balance 总金额，包含冻结资金 -->
-		<view class="stored-list flex-center pd-lg mt-sm ml-md mr-md fill-base box-shadow radius-20"
-			v-if="!mineInfo.is_user && user_type == 1">
+            <view class="stored-list flex-center pd-lg mt-sm ml-md mr-md fill-base box-shadow radius-20"
+            	v-if="user_type == 1 && (mineInfo && mineInfo.balance !== undefined)">
 			<auth :needAuth="userInfo && !userInfo.nickName" :must="true"
 				@go="$util.toCheckLogin({url:`/mine/pages/balance/index`})" class="stored-item">
 				<view class="flex-center flex-column c-title">
-					<view class="f-lg-title text-bold">{{mineInfo.balance}}</view>
+                    <view class="f-lg-title text-bold">{{mineInfo.balance || 0}}</view>
 					<view class="f-caption c-caption">我的余额</view>
 				</view>
 			</auth>
 			<auth :needAuth="userInfo && !userInfo.nickName" :must="true"
 				@go="$util.toCheckLogin({url:`/mine/pages/balance/index`})" class="stored-item">
 				<view class="flex-center flex-column c-title">
-					<view class="f-lg-title text-bold">{{mineInfo.frozen_cash}}</view>
+                    <view class="f-lg-title text-bold">{{mineInfo.frozen_cash || 0}}</view>
 					<view class="f-caption c-caption">冻结资金</view>
 				</view>
 			</auth>
 			<auth :needAuth="userInfo && !userInfo.nickName" :must="true"
 				@go="$util.toCheckLogin({url:`/shop/pages/integral/record`})" class="stored-item">
 				<view class="flex-center flex-column c-title">
-					<view class="f-lg-title text-bold">{{mineInfo.integral}}</view>
+                    <view class="f-lg-title text-bold">{{mineInfo.integral || 0}}</view>
 					<view class="f-caption c-caption">我的积分</view>
 				</view>
 			</auth>
@@ -160,8 +160,8 @@
 				</view>
 			</view>
 
-			<view class="mine-menu-list mt-md ml-md mr-md fill-base box-shadow radius-20"
-				v-if="mineInfo.is_landlord && businessList.length > 0">
+            <view class="mine-menu-list mt-md ml-md mr-md fill-base box-shadow radius-20"
+                v-if="(mineInfo && mineInfo.is_landlord) && businessList.length > 0">
 				<view class="common-nav-title flex-center c-title pl-lg mb-lg b-1px-b">
 					<view class="f-title text-bold flex-1">商家专属</view>
 				</view>
@@ -178,7 +178,7 @@
 		</block>
 
 		<block v-if="user_type == 2">
-			<view class="mine-menu-list rel ml-md mr-md fill-base box-shadow radius-20">
+        <view class="mine-menu-list rel ml-md mr-md fill-base box-shadow radius-20" v-if="orderList && orderList.length">
 				<view class="cancel-auth iconfont icon-biaoqian c-warning flex-center abs"
 					v-if="mineInfo.farmer_status == 3">
 					<view class="text-bold f-icontext abs">取消授权</view>
@@ -380,8 +380,7 @@
 				])
 				this.farmer_info = farmer_info
 				let {
-					farmer_status,
-					fx_status
+					farmer_status
 				} = this.mineInfo
 				this.user_type = farmer_status == 2 || farmer_status == 3 ? this.user_type : 1
 				let arr = ['farmer_status', 'fx_status']

uniapp/uni-app/shop/pages/detail.vue

@@ -5,7 +5,7 @@
 
 		<view class="seckill-info rel mb-md"
 			v-if="(currentSpecs.id && currentSpecs.kill_atv && currentSpecs.kill_atv.id) || (detail.kill_list && detail.kill_list.id)">
-			<image mode="aspectFill" class="seckill-img abs" src="/static/image/shop/seckill.png">
+			<image mode="aspectFill" class="seckill-img abs" src="/shop/static/image/shop/seckill.png">
 			</image>
 			<view class="seckill-btn abs flex-center f-desc text-bold radius" :style="{color:primaryColor}"
 				v-if="currentSpecs.kill_atv.id ? currentSpecs.kill_atv.atv_status==1:detail.kill_list.atv_status==1">

uniapp/uni-app/shop/pages/integral/list.vue

@@ -19,7 +19,7 @@
 					<view class="f-caption">每日签到可获得{{detail.signin_integral}}积分</view>
 				</view>
 				<view @tap="$util.goUrl({url:`/shop/pages/integral/record`})" class="flex-center flex-column">
-					<image lazy-load class="integral-img" src="/static/image/shop/integral.png"></image>
+					<image lazy-load class="integral-img" src="/shop/static/image/shop/integral.png"></image>
 					<view class="flex-y-baseline f-icontext mb-sm">
 						<view class="f-paragraph">{{detail.integral}}</view>积分
 					</view>

uniapp/uni-app/shop/pages/order.vue

@@ -65,7 +65,7 @@
 						:src="aitem.cover"></image>
 					<view class="sell-out-info flex-center abs radius-16" v-if="aitem.all_stock < 1">
 						<image mode="aspectFill" lazy-load class="sell-out-img"
-							:src="`/static/image/shop/sell_out.png`"></image>
+							:src="`/shop/static/image/shop/sell_out.png`"></image>
 					</view>
 				</view>
 				<view class="flex-1 ml-md">

uniapp/uni-app/shop/pages/seckill.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="shop-seckill" v-if="isLoad">
 		<uni-nav-bar :fixed="true" :shadow="false" :statusBar="true" color="#fff" :backgroundColor="``"
-			image="/static/image/shop/seckill-nav.png" leftIcon="icon-left" v-if="tabList.length>0">
+			image="/shop/static/image/shop/seckill-nav.png" leftIcon="icon-left" v-if="tabList.length>0">
 		</uni-nav-bar>
 		<uni-nav-bar :fixed="true" :shadow="false" :statusBar="true" color="#fff" :backgroundColor="primaryColor"
 			title="限时秒杀" leftIcon="icon-left" v-else>
@@ -26,14 +26,14 @@
 			<view @tap.stop="goDetail(index)"
 				class="goods-item flex-center rel ml-md mr-md pt-lg pb-lg pl-md pr-md fill-base"
 				:class="[{'radius-bottom':index==0},{'mt-md radius-16':index>0}]">
-				<image mode="aspectFill" lazy-load class="seckill-tag abs" src="/static/image/shop/seckill-tag.png">
+				<image mode="aspectFill" lazy-load class="seckill-tag abs" src="/shop/static/image/shop/seckill-tag.png">
 				</image>
 				<image mode="aspectFill" lazy-load class="cover radius-16" :src="item.cover"></image>
 				<view class="flex-1 ml-md">
 					<view class="f-title c-title text-bold mt-sm mb-sm ellipsis">{{item.goods_name}}
 					</view>
 					<view class="flex-center f-caption c-desc">
-						<image mode="aspectFill" lazy-load class="store-img" src="/static/image/shop/seckill-store.png">
+						<image mode="aspectFill" lazy-load class="store-img" src="/shop/static/image/shop/seckill-store.png">
 						</image>
 						<view class="flex-1 ml-sm max-350 ellipsis">{{item.store_name}}</view>
 					</view>

uniapp/uni-app/shop/pages/sign.vue

@@ -10,7 +10,7 @@
 			</view>
 			<view class="integral-info abs flex-center flex-column c-base">
 				<view class="integral-num">{{detail.integral}}</view>
-				<image lazy-load class="integral-icon mt-sm" src="/static/image/shop/integral.png"></image>
+				<image lazy-load class="integral-icon mt-sm" src="/shop/static/image/shop/integral.png"></image>
 				<view class="f-icontext">我的积分</view>
 			</view>
 			<view class="count-info abs flex-center ml-md mr-md fill-base radius-24">
@@ -62,7 +62,7 @@
 			<view class="f-title c-title text-bold">积分纪录</view>
 			<block v-for="(item,index) in list.data" :key="index">
 				<view @tap.stop="goDetail(index)" class="integral-item flex-center mt-md radius-16">
-					<image lazy-load class="integral-img radius-16" src="/static/image/shop/integral.png"></image>
+					<image lazy-load class="integral-img radius-16" src="/shop/static/image/shop/integral.png"></image>
 					<view class="flex-1 ml-lg">
 						<view class="flex-1 flex-between">
 							<view>

uniapp/uni-app/shop/pages/store.vue

@@ -57,14 +57,14 @@
 			</view>
 		</scroll-view>
 		<view :style="{height:`${shopHeight}px`}" v-if="storeInfo.id"></view>
-		<view class="goods-list rel" :style="{minHeight:`${shopHeight}px`}" v-if="cateList.length > 0">
+				<view class="goods-list rel" :style="{minHeight:`${shopHeight}px`}" v-if="cateList.length > 0">
 			<view @tap.stop="getGoodsSpec(index)" class="item-child flex-center ml-md mr-lg pt-lg pb-lg"
 				:class="[{'b-1px-t':index!=0}]" v-for="(item,index) in list.data" :key="index">
 				<view @tap.stop="goDetail(index)" class="rel">
 					<image mode="aspectFill" lazy-load class="goods-img radius-16" :src="item.cover"></image>
 					<view class="sell-out-info flex-center abs radius-16" v-if="item.all_stock < 1">
 						<image mode="aspectFill" lazy-load class="sell-out-img"
-							:src="`/static/image/shop/sell_out.png`"></image>
+							:src="`/shop/static/image/shop/sell_out.png`"></image>
 					</view>
 				</view>
 				<view class="flex-1 ml-md">
@@ -99,7 +99,7 @@
 			<view class="store-pay-info pt-md pb-md fill-base fix">
 				<view @tap.stop="$refs.show_car_item.open()" class="flex-between pay-info ml-lg mr-lg fill-base">
 					<view class="car-img-info rel pr-md">
-						<image mode="aspectFill" lazy-load class="car-img abs" :src="`/static/image/shop/cart.png`">
+						<image mode="aspectFill" lazy-load class="car-img abs" :src="`/shop/static/image/shop/cart.png`">
 						</image>
 						<view class="car-num flex-center fill-warning c-base f-icontext abs"
 							:style="{width: shopCarList.car_count<10 ? '30rpx' : '50rpx'}">{{shopCarList.car_count}}
@@ -245,7 +245,7 @@
 				<view @tap.stop="goOrder" class="store-pay-info pt-md pb-md fill-base">
 					<view class="flex-between pay-info ml-lg mr-lg fill-base">
 						<view class="car-img-info rel pr-md">
-							<image mode="aspectFill" lazy-load class="car-img abs" :src="`/static/image/shop/cart.png`">
+							<image mode="aspectFill" lazy-load class="car-img abs" :src="`/shop/static/image/shop/cart.png`">
 							</image>
 							<view class="car-num flex-center fill-warning c-base f-icontext abs"
 								:style="{width: shopCarList.car_count<10 ? '30rpx' : '50rpx'}">{{shopCarList.car_count}}

uniapp/uni-app/unpackage/dist/build/web/index.html

@@ -1,2 +0,0 @@
-<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>智慧农场</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/h5/static/js/chunk-vendors.e141688c.js></script><script src=/h5/static/js/index.bd8e2418.js></script></body></html>