common/global.scss
@@ -75,7 +75,7 @@ } .component-popup_input{ margin: 0 auto; margin-top: calc(50% + 200rpx); margin-top: 160rpx; // margin-left: 78rpx - 26rpx; width: 594rpx; common/self.scss
@@ -24,7 +24,7 @@ color: var(--topicolor) !important; } .flex-wrap-normal{ flex-wrap: nowrap; flex-wrap: nowrap !important; } .topic-gray{ color: var(--topicgray); components/footer/farmer-footer.vue
@@ -11,9 +11,9 @@ </view> <view v-if="index==1"> <image src="../../static/imgs/footer/footer-self-1.png" class="footer-icon m-t-4 m-l-a m-r-0" :class="(''+index)" v-if="flg==2"></image> v-if="flg==1"></image> <image src="../../static/imgs/footer/footer-self-0.png" class="footer-icon m-t-4 m-l-a m-r-0" :class="(''+index)" v-if="flg!=2"></image> v-if="flg!=1"></image> </view> <view class="m-l-0 m-r-a"> {{item.text}} components/footer/main.scss
@@ -50,10 +50,7 @@ // height: 50rpx; // margin-top: 20rpx; // } .footer-icon{ width: 28rpx; height: 29rpx; } .footer-icon.0 { width: 28rpx; height: 29rpx; @@ -71,7 +68,10 @@ // position: sticky; // top: -10px; // } .footer-icon{ width: 28rpx; height: 29rpx; } .footer.farmer-footer{ left: 50%; transform: translateX(-50%); components/no-data.vue
@@ -1,6 +1,8 @@ <template> <view> <image src="../static/common/nodata.png" class="img-nodata"></image> <image src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/5e/5e01669de7ec4500b41711b64a7ca0fcnodata.png" class="img-nodata"></image> <!-- <image src="../static/common/nodata.png" class="img-nodata"></image> --> <view class="txt-nodata">尽力了，没有找到数据</view> </view> </template> pages/address/address.vue
文件已删除 pages/bussincess/order/bussincess-canteen/bussincess-canteen.vue
文件已删除 pages/bussincess/order/bussincess-good/bussincess-good.vue
文件已删除 pages/bussincess/order/bussincess-shop/bussincess-shop.vue
文件已删除 pages/bussincess/order/bussincess-travel/bussincess-travel.vue
文件已删除 pages/home/home.scss
@@ -2,6 +2,8 @@ .main-container{ // background-image: url('../../static/images/farmer/home/bg.png'); background: #E1F0E7; // https://hmy-flower.oss-cn-shanghai.aliyuncs.com/2a/2aa62e6bd1f74456b005d3f57daa54adbg.png .top-bg{ background-image: unset; max-height: unset; @@ -153,6 +155,7 @@ transform: translateY(-50%) rotate(0deg); /* 旋转90度使三角形指向右，并垂直居中 */ border-top: 12rpx solid transparent; border-left: 12rpx solid #20613D; margin-top: -3rpx; border-bottom: 12rpx solid transparent; } .name.pink::after{ @@ -228,14 +231,14 @@ } .order-icon.shlp{ // margin-top: 16rpx; margin-top: -4rpx; margin-top: -1rpx; width: 54rpx; height: 58rpx; } .order-icon.kkjl{ // margin-top: 12rpx; // margin-top: 0rpx; margin-top: -6rpx; margin-top: -3rpx; width: 58rpx; height: 58rpx; } pages/login/farmer-login.vue
@@ -2,7 +2,7 @@ <view class="main-container login-container img100 relative" style="margin-top: 0rpx;"> <!-- background-image:url('@/static/images/farmer/login/bg.png') --> <image class="component-bg" src="/static/images/farmer/login/bg.png" mode="scaleToFill" /> <image class="component-bg" src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/a5/a54508de179a4942918ecb2c5a4aa9f5bg.png" mode="scaleToFill" /> <view class="t-login top-bg"> <view class="nav-title">登录</view> <view class="login"> pages/user/farmer-user.vue
@@ -5,8 +5,8 @@ </view> --> <!-- 背景图 --> <view class="top-bg img100 relative" :style="{'padding-top':(StatusBar)+'px','line-height':CustomBar+'rpx' }"> <image class="component-bg" src="/static/images/farmer/user/bg.png" mode="scaleToFill" /> <image class="component-bg" src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/21/21c95c14e9504be69edff7785e3b44a9bg.png" mode="scaleToFill" /> <view class="title" style="position: relative;"> 我的
@@ -7,7 +7,7 @@ .top-bg{ padding: 32rpx; background-image: url('../../static/images/farmer/user/bg.png'); // background-image: url('../../static/images/farmer/user/bg.png'); height: 438rpx; max-height: 438rpx; static/common/icon-clock.pngBinary files differ
static/common/icon-loc-filled.pngBinary files differ
static/common/nodata.pngBinary files differ
static/images/farmer/home/bg.pngBinary files differ
static/images/farmer/login/bg.pngBinary files differ
static/images/farmer/user/bg.pngBinary files differ
static/imgs/home/home-shop-top-icon.png
@@ -1,6 +1,7 @@ <template> <view class="main-container login-container img100 relative" style="margin-top: 0rpx;"> <image class="component-bg" src="/static/images/farmer/login/bg.png" mode="scaleToFill" /> <image class="component-bg" src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/a5/a54508de179a4942918ecb2c5a4aa9f5bg.png" mode="scaleToFill" /> <view class="t-login top-bg"> <view class="nav-title">注册</view>
