Merge branch 'master' of https://gitea.lihaink.cn/weipengfei/purchase-let
This commit is contained in:
commit
008ca30545
|
|
@ -5,7 +5,6 @@
|
|||
<up-input v-model="storePhone" border="none" prefixIcon="phone" placeholder="请输入门店手机号"
|
||||
:customStyle="{background:'#F3F3F3',padding:'20rpx','border-radius':'30rpx'}"
|
||||
:placeholderStyle="{color:'#444444'}" :prefixIconStyle="{'margin-right':'40rpx'}"></up-input>
|
||||
|
||||
</view>
|
||||
</up-modal>
|
||||
</view>
|
||||
|
|
@ -80,7 +79,7 @@
|
|||
<uni-th width="50" align="center">状态</uni-th>
|
||||
</uni-tr>
|
||||
<!-- 表格数据行 -->
|
||||
<uni-tr v-for="(item,index) in lists" :key="index">
|
||||
<uni-tr v-for="(item,index) in lists" :key="item.order_id">
|
||||
<uni-td align="center">{{index+1}}</uni-td>
|
||||
<uni-td style="font-size: 20rpx;" align="center">{{item.real_name}}</uni-td>
|
||||
<uni-td style="font-size: 20rpx;" align="center">{{item.price}}</uni-td>
|
||||
|
|
@ -105,35 +104,35 @@
|
|||
<up-line style="margin-top:20rpx "></up-line>
|
||||
<view class="address-content" v-if='currentAddressIndex==0'>
|
||||
<view class="address-li" :class='{act:item.city_code==formData.city}' v-for="item in addressList.city"
|
||||
@click="addressLiClick(0, item)">
|
||||
:key="item.city_code" @click="addressLiClick(0, item)">
|
||||
<text>{{item.city_name}}</text>
|
||||
<up-icon name="arrow-right" :color="item.city_code==formData.city ?'#20B128':'#777777'" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="address-content" v-else-if='currentAddressIndex==1'>
|
||||
<view class="address-li" v-for="item in addressList.area" @click="addressLiClick(1,item)"
|
||||
:class='{act:item.area_code==formData.area}'>
|
||||
:key="item.area_code" :class='{act:item.area_code==formData.area}'>
|
||||
<text>{{item.area_name}}</text>
|
||||
<up-icon name="arrow-right" :color="item.area_code==formData.area ?'#20B128':'#777777'" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="address-content" v-else-if='currentAddressIndex==2'>
|
||||
<view class="address-li" v-for="item in addressList.street" @click="addressLiClick(2,item)"
|
||||
:class='{act:item.street_code==formData.street}'>
|
||||
:key="item.street_code" :class='{act:item.street_code==formData.street}'>
|
||||
<text>{{item.street_name}}</text>
|
||||
<up-icon name="arrow-right" :color="item.street_code==formData.street ?'#20B128':'#777777'" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="address-content" v-else-if='currentAddressIndex==3'>
|
||||
<view class="address-li" v-for="item in addressList.village" @click="addressLiClick(3,item)"
|
||||
:class='{act:item.village_code==formData.village}'>
|
||||
:key="item.village_code" :class='{act:item.village_code==formData.village}'>
|
||||
<text>{{item.village_name}}</text>
|
||||
<up-icon name="arrow-right" :color="item.village_code==formData.village ?'#20B128':'#777777'" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="address-content" v-else-if='currentAddressIndex==4'>
|
||||
<view class="address-li" :class='{act:item.id==formData.brigade}' v-for="item in addressList.brigade"
|
||||
@click="addressLiClick(4,item)">
|
||||
:key="item.id" @click="addressLiClick(4,item)">
|
||||
<text>{{item.brigade_name}}</text>
|
||||
<up-icon name="arrow-right" :color="item.id==formData.brigade ?'#20B128':'#777777'" />
|
||||
</view>
|
||||
|
|
@ -166,9 +165,8 @@
|
|||
onPullDownRefresh
|
||||
} from "@dcloudio/uni-app"
|
||||
|
||||
|
||||
const showModa = ref(true)
|
||||
const storePhone = ref('15699996666')
|
||||
const storePhone = ref('')
|
||||
const confirmStore = () => {
|
||||
getStoreByPhone({
|
||||
phone: storePhone.value
|
||||
|
|
@ -201,7 +199,6 @@
|
|||
brigade: "",
|
||||
real_name: "",
|
||||
auth_code: "",
|
||||
// auth_code: "",
|
||||
address: ""
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -64,19 +64,18 @@
|
|||
<view>运费</view>
|
||||
<view><text>¥</text>0<text>.00</text></view>
|
||||
</view>
|
||||
<view class="row" v-if="[4,5,6].includes(userInfo.user_ship) ">
|
||||
<view class="row" v-if="[4,5,6].includes(userInfo.user_ship)" style="color: red;">
|
||||
<view>优惠减免</view>
|
||||
<view>
|
||||
<text>-¥</text>{{ c_price(orderInfo.preferential_amount, 0) }}<text>.{{ c_price(orderInfo.preferential_amount, 1) }}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- <view class="row" v-if="orderInfo.activities == 1" style="color: red;">
|
||||
<view>活动折扣 <text>{{ orderInfo.activity }}</text></view>
|
||||
<view>
|
||||
-¥<text>{{ orderInfo.activity_price }}</text>
|
||||
<view class="row" v-if="userInfo.user_ship==1 ">
|
||||
<view>消费返利</view>
|
||||
<view style="color: red;">
|
||||
<text>-¥</text>{{ c_price(orderInfo.activities, 0) }}<text>.{{ c_price(orderInfo.activities, 1) }}</text>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
<view class="m-card good-info">
|
||||
<view class="head-title">支付方式</view>
|
||||
|
|
@ -118,13 +117,6 @@
|
|||
</view>
|
||||
</view>
|
||||
|
||||
<!-- <view class="m-card order-remark">
|
||||
<view class="head-title">
|
||||
<text>预约时间</text>
|
||||
</view>
|
||||
<uni-datetime-picker type="date" :clear-icon="false" v-model="reservation_time" />
|
||||
</view> -->
|
||||
|
||||
<view class="m-card order-remark">
|
||||
<view class="head-title">
|
||||
<text>订单备注</text>
|
||||
|
|
|
|||
Loading…
Reference in New Issue