1

pages/login/login.vue

@@ -36,9 +36,9 @@
 			</view>
 		</block>
 		<view class="small-btn">
-			<view  class="reg-btn" @click="loginType = !loginType">
+			<!-- <view  class="reg-btn" @click="loginType = !loginType">
 				切换登录方式
-			</view>
+			</view> -->
 			<!-- <navigator v-if="loginType == false" class="forget-pass" url="/pages/login/regist?type=3">
 				{{i18n.login.forgetPass}}
 			</navigator> -->
@@ -75,7 +75,7 @@
 				wayValue:0,
 				captchaImg:'',
 				top: 0,
-				loginType: false,
+				loginType: true,
 				codetimes: '获取验证码',
 				timer: null,
 				canshowcode: false,

pages/shop/orderDetail.vue

@@ -249,7 +249,7 @@
 				this.NB.sendRequest("/mall/order/detail/"+ this.shopId, {}, false, 'get', 'application/json').then((res) => {
 					if (res.code == 200) {
 						that.data = res.result
-						
+						console.log('缓存shopTakeaway',uni.getStorageSync('shopTakeaway'))
 						//商家预计收入的计算1
 						let price = that.data.goodsAmount+that.data.packageFee
 						if(that.data.orderType == 1){

pages/shop/shopEvaluate.vue

@@ -28,9 +28,7 @@
 						<view :style="{'width':index == 0?'160rpx':'180rpx'}" style="text-align: left;">
 							{{item.name}} {{item.num}}
 						</view>
-						<img v-if="item.checked" class="checked-img"
-							src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4bb5fc7725cb4a7a84d1d3a15f05b39c.png"
-							alt="" />
+						<img v-if="item.checked" class="checked-img" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4bb5fc7725cb4a7a84d1d3a15f05b39c.png" alt="" />
 					</view>
 				</view>
 			</view>
@@ -38,8 +36,7 @@
 				<view v-for="(item,index) in shopComments" :key="index">
 					<view class="eval-title">
 						<view class="eval-icon">
-							<img :src="item.createByIcon"
-								alt="" />
+							<img :src="item.createByIcon" alt="" />
 						</view>
 						<view class="eval-name">
 							<view class="name1">
@@ -87,13 +84,11 @@
 										<textarea name="" v-model="replyText" id="" cols="30" rows="10" placeholder="有什么想说的吗？可以写下来，提交给我们" style="width: 100%;font-size: 28rpx;padding: 30rpx;height: 200rpx;"></textarea>
 									</view>
 									<view class="eval-num" style="border: none;padding: 0 30rpx;display: flex;margin-bottom: 10px;">
-										<view class="upload-img" @tap="pictureAdd()"
-											style="background: #eee;text-align: center;line-height: 160rpx;">
+										<view class="upload-img" @tap="pictureAdd()" style="background: #eee;text-align: center;line-height: 160rpx;">
 											<uni-icons type="camera" size="28" color="#777"></uni-icons>
 										</view>
 										<view style="flex: 1;display: flex;">
-											<view v-if="replyPicture !=''"
-												:key="index" style="width: 160rpx;height: 160rpx;margin-left: 20rpx;">
+											<view v-if="replyPicture !=''" :key="index" style="width: 160rpx;height: 160rpx;margin-left: 20rpx;">
 												<img :src="replyPicture" alt="" class="upload-img">
 											</view>
 										</view>