Compare commits

..

No commits in common. "bab849a14eb5b152c5633b0804faa74a65cb7c76" and "0b5c8a21e73c4ebcc775ec7fbf3524b47fc93a5f" have entirely different histories.

33 changed files with 30 additions and 206 deletions

View File

@ -69,19 +69,11 @@
</view> </view>
<!-- 用户信息授权手机号授权 --> <!-- 用户信息授权手机号授权 -->
<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo> <auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
<!-- 底部导航 -->
<view class="posixzy">
<bottom-tab></bottom-tab>
</view>
</view> </view>
</template> </template>
<script> <script>
import bottomTab from '@/components/bottom-tab.vue';
export default { export default {
components: {
bottomTab,
},
data() { data() {
return { return {
isScreenshot:false, isScreenshot:false,

View File

@ -46,20 +46,14 @@
</view> </view>
<!-- 用户信息授权手机号授权 --> <!-- 用户信息授权手机号授权 -->
<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo> <auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
<!-- 底部导航 -->
<view class="posixzy">
<bottom-tab></bottom-tab>
</view>
</view> </view>
</template> </template>
<script> <script>
import yzQr from '@/components/yz-qr/yz-qr.vue'; import yzQr from '@/components/yz-qr/yz-qr.vue';
import bottomTab from '@/components/bottom-tab.vue';
export default { export default {
components:{ components:{
yzQr, yzQr
bottomTab,
}, },
data() { data() {
return { return {

View File

@ -30,7 +30,7 @@
<nothing-page v-if="dataList.length==0" :content="'暂无更多预约内容'"></nothing-page> <nothing-page v-if="dataList.length==0" :content="'暂无更多预约内容'"></nothing-page>
</view> </view>
<!-- 底部按钮 --> <!-- 底部按钮 -->
<view class="posixzy bacf pad-sx25" style="bottom: 180rpx; background: none;"> <view class="posixzy bacf pad-sx25">
<view @tap="goYu" class="fon30 radius20 tc colf bold" style="margin: 0 83rpx;height: 90rpx;line-height: 90rpx;" :style="{background:publicColor}">我要预约</view> <view @tap="goYu" class="fon30 radius20 tc colf bold" style="margin: 0 83rpx;height: 90rpx;line-height: 90rpx;" :style="{background:publicColor}">我要预约</view>
</view> </view>
<!-- 弹框 --> <!-- 弹框 -->
@ -39,19 +39,11 @@
<public-customer></public-customer> <public-customer></public-customer>
<!-- 用户信息授权手机号授权 --> <!-- 用户信息授权手机号授权 -->
<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo> <auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
<!-- 底部导航 -->
<view class="posixzy">
<bottom-tab></bottom-tab>
</view>
</view> </view>
</template> </template>
<script> <script>
import bottomTab from '@/components/bottom-tab.vue';
export default { export default {
components: {
bottomTab,
},
data() { data() {
return { return {
failColor:'#CCCCCC',// failColor:'#CCCCCC',//

View File

@ -45,20 +45,14 @@
<scoreList :dataList="dataList"></scoreList> <scoreList :dataList="dataList"></scoreList>
<!-- 用户信息授权手机号授权 --> <!-- 用户信息授权手机号授权 -->
<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo> <auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
<!-- 底部导航 -->
<view class="posixzy">
<bottom-tab></bottom-tab>
</view>
</view> </view>
</template> </template>
<script> <script>
import scoreList from '@/components/score-list.vue'; import scoreList from '@/components/score-list.vue';
import bottomTab from '@/components/bottom-tab.vue';
export default { export default {
components:{ components:{
scoreList, scoreList
bottomTab,
}, },
data() { data() {
return { return {

View File

@ -28,21 +28,13 @@
<public-customer></public-customer> <public-customer></public-customer>
<!-- 用户信息授权手机号授权 --> <!-- 用户信息授权手机号授权 -->
<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo> <auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
<!-- 底部导航 -->
<view class="posixzy">
<bottom-tab></bottom-tab>
</view>
</view> </view>
</template> </template>
<script> <script>
import {base64ToPath} from '@/jsFile/base64-src.js'; import {base64ToPath} from '@/jsFile/base64-src.js';
import {checkBanner} from '@/jsFile/publicAPI.js'; import {checkBanner} from '@/jsFile/publicAPI.js';
import bottomTab from '@/components/bottom-tab.vue';
export default { export default {
components: {
bottomTab,
},
data() { data() {
return { return {
optionObj:'', optionObj:'',

View File

@ -22,7 +22,7 @@
</view> </view>
</view> </view>
</view> </view>
<view @tap.stop="obtainLngLat" class="posixzy address_add" style="bottom: 180rpx;">添加地址</view> <view @tap.stop="obtainLngLat" class="posixzy address_add" style="bottom: 20rpx;">添加地址</view>
<view style="margin-top: 50%;"> <view style="margin-top: 50%;">
<nothing-page v-if="dataList.length==0" :content="'暂无可用地址'"></nothing-page> <nothing-page v-if="dataList.length==0" :content="'暂无可用地址'"></nothing-page>
</view> </view>
@ -86,20 +86,12 @@
</view> </view>
</view> </view>
</view> </view>
<!-- 底部导航 -->
<view class="posixzy">
<bottom-tab></bottom-tab>
</view>
</view> </view>
</template> </template>
<script> <script>
import {lotusAddressJson} from '@/components/city/city.js'; import {lotusAddressJson} from '@/components/city/city.js';
import bottomTab from '@/components/bottom-tab.vue';
export default { export default {
components: {
bottomTab,
},
data() { data() {
return { return {
dataList:[], dataList:[],

View File

@ -45,19 +45,11 @@
</view> </view>
<!-- 用户信息授权手机号授权 --> <!-- 用户信息授权手机号授权 -->
<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo> <auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
<!-- 底部导航 -->
<view class="posixzy">
<bottom-tab></bottom-tab>
</view>
</view> </view>
</template> </template>
<script> <script>
import bottomTab from '@/components/bottom-tab.vue';
export default { export default {
components: {
bottomTab,
},
data() { data() {
return { return {
timeList:[], timeList:[],

View File

@ -40,10 +40,6 @@
<view class="fon24 col3">暂无内容</view> <view class="fon24 col3">暂无内容</view>
</view> </view>
</view> </view>
<!-- 分享 -->
<view @tap="shareImgEv" class="detail-cart-box" style="display: flex;justify-content: center;align-items: center;width: 112rpx;height: 112rpx;border-radius: 100%;background-color: #0fac29;bottom: 160rpx;color: #FFFFFF;">
<image class="zanw-img" src="/static/public/share-pyq.png" mode="aspectFill" style="width: 64rpx;height: 81rpx;"></image>
</view>
<view class="posixzy disjbac bacf pad-zy32 btnBKS"> <view class="posixzy disjbac bacf pad-zy32 btnBKS">
<view class="posir"> <view class="posir">
<image @tap="backHome" class="posia backH" src="/static/public/back-home.png" mode="aspectFill"></image> <image @tap="backHome" class="posia backH" src="/static/public/back-home.png" mode="aspectFill"></image>
@ -67,7 +63,6 @@
</template> </template>
<script> <script>
import { base64ToPath } from '@/jsFile/base64-src.js';
export default { export default {
data() { data() {
return { return {
@ -89,7 +84,6 @@
total:'',// total:'',//
isZanw:true, isZanw:true,
// shareImg:''// // shareImg:''//
shareFlag:true,
} }
}, },
computed: { computed: {
@ -134,38 +128,6 @@
} }
}, },
methods: { methods: {
//
shareImgEv(){
this.$toolAll.tools.showToast('分享图生成中...','none',10000);
if(this.shareFlag){
this.shareFlag = false;
this.$requst.post('archives/share',{id:this.detailId}).then(res=>{
base64ToPath(res.data.share_img).then(path=>{
uni.hideToast();
this.$toolAll.tools.showToast('正在调起分享...');
wx.showShareImageMenu({
path: path,
success:(res=>{
this.shareFlag = true;
this.$requst.post('user/record', {
type: 'content',
action: 'share',
id: this.detailId
}).then(res => {
console.log('分享成功:', res);
}, error => {})
// tools.js
this.$toolAll.tools.plantPoint(4);
}),
fail:(err=>{
this.shareFlag = true;
})
})
})
})
} else {this.$toolAll.tools.showToast('请勿重复点击');}
},
checkAbout(category_id){ checkAbout(category_id){
let params = { let params = {
category_id:category_id, category_id:category_id,

View File

@ -38,19 +38,11 @@
</view> </view>
<!-- 用户信息授权手机号授权 --> <!-- 用户信息授权手机号授权 -->
<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo> <auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
<!-- 底部导航 -->
<view class="posixzy">
<bottom-tab></bottom-tab>
</view>
</view> </view>
</template> </template>
<script> <script>
import bottomTab from '@/components/bottom-tab.vue';
export default { export default {
components: {
bottomTab,
},
data() { data() {
return { return {
dataList:[], dataList:[],

View File

@ -30,20 +30,12 @@
<!-- 返回顶部 --> <!-- 返回顶部 -->
<!-- <back-top :showTop="showTop" @backTop="backTop"></back-top> --> <!-- <back-top :showTop="showTop" @backTop="backTop"></back-top> -->
<!-- 底部客服 --> <!-- 底部客服 -->
<public-customer :nbottom="180"></public-customer> <public-customer :nbottom="100"></public-customer>
<!-- 底部导航 -->
<view class="posixzy">
<bottom-tab></bottom-tab>
</view>
</view> </view>
</template> </template>
<script> <script>
import bottomTab from '@/components/bottom-tab.vue';
export default { export default {
components: {
bottomTab,
},
data() { data() {
return { return {
searchVal:'',// searchVal:'',//

View File

@ -121,22 +121,16 @@
<!-- 返回顶部 --> <!-- 返回顶部 -->
<!-- <back-top :showTop="showTop" @backTop="backTop"></back-top> --> <!-- <back-top :showTop="showTop" @backTop="backTop"></back-top> -->
<!-- 底部客服 --> <!-- 底部客服 -->
<public-customer :nbottom="180"></public-customer> <public-customer :nbottom="100"></public-customer>
<!-- 底部导航 -->
<view class="posixzy">
<bottom-tab></bottom-tab>
</view>
</view> </view>
</template> </template>
<script> <script>
import {cancleCollectionEV,cancleCollectionShopEV} from '@/jsFile/publicAPI.js'; import {cancleCollectionEV,cancleCollectionShopEV} from '@/jsFile/publicAPI.js';
import shopList from '@/components/shop-list.vue'; import shopList from '@/components/shop-list.vue';
import bottomTab from '@/components/bottom-tab.vue';
export default { export default {
components:{ components:{
shopList, shopList
bottomTab,
}, },
data() { data() {
return { return {

View File

@ -92,8 +92,8 @@
</view> </view>
</view> </view>
<!-- 分享 --> <!-- 分享 -->
<view @tap="shareImgEv" class="detail-cart-box" style="display: flex;justify-content: center;align-items: center;width: 112rpx;height: 112rpx;border-radius: 100%;background-color: #0fac29;bottom: 160rpx;color: #FFFFFF;"> <view @tap="shareImgEv" class="detail-cart-box" style="display: flex;justify-content: center;align-items: center;width: 112rpx;height: 112rpx;border-radius: 100%;background-color: rgba(0,0,0,.5);bottom: 160rpx;color: #FFFFFF;">
<image class="zanw-img" src="/static/public/share-pyq.png" mode="aspectFill" style="width: 64rpx;height: 81rpx;"></image> 分享
</view> </view>
<!-- 返回顶部 --> <!-- 返回顶部 -->
<!-- <back-top :showTop="showTop" @backTop="backTop"></back-top> --> <!-- <back-top :showTop="showTop" @backTop="backTop"></back-top> -->

View File

@ -182,8 +182,8 @@
</view> </view>
</view> </view>
<!-- 分享 --> <!-- 分享 -->
<view @tap="shareImgEv" class="detail-cart-box" style="display: flex;justify-content: center;align-items: center;width: 112rpx;height: 112rpx;border-radius: 100%;background-color: #0fac29;bottom: 436rpx;color: #FFFFFF;"> <view @tap="shareImgEv" class="detail-cart-box" style="display: flex;justify-content: center;align-items: center;width: 112rpx;height: 112rpx;border-radius: 100%;background-color: rgba(0,0,0,.5);bottom: 436rpx;color: #FFFFFF;">
<image class="zanw-img" src="/static/public/share-pyq.png" mode="aspectFill" style="width: 64rpx;height: 81rpx;"></image> 分享
</view> </view>
<!-- 购物车 --> <!-- 购物车 -->
<view @tap="goShopCart" class="detail-cart-box"> <view @tap="goShopCart" class="detail-cart-box">

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long