yfx
2026-03-16 4065a1ffca0287fa48bcd35916450b6859e870dc
Merge remote-tracking branch 'origin/master'

# Conflicts:
# App.vue
# androidPrivacy.json
# main.js
# manifest.json
# pages/addAddr/addAddr.vue
# pages/addBank/addBank.vue
# pages/address/address.vue
# pages/bank/bank.vue
# pages/carts/carts.vue
# pages/cates/cates.vue
# pages/catesList/catesList.vue
# pages/collect/collect.vue
# pages/customer/customer.vue
# pages/edu/edu.vue
# pages/entrust/entrust.vue
# pages/findpass/findpass.vue
# pages/ginfo/ginfo.vue
# pages/idcard/idcard.vue
# pages/index/index.vue
# pages/job/job.vue
# pages/logs/logs.vue
# pages/my/my.vue
# pages/order/order.vue
# pages/orderinfo/orderinfo.vue
# pages/pays/pays.vue
# pages/profile/profile.vue
# pages/regist/regist.vue
# pages/search/search.vue
# pages/wallet/wallet.vue
32 files modified
13 files deleted
1434 ■■■■ changed files
App.vue 20 ●●●● patch | view | raw | blame | history
androidPrivacy.json 2 ●●● patch | view | raw | blame | history
components/picker/aliCredit.vue 33 ●●●●● patch | view | raw | blame | history
components/picker/areas.vue 68 ●●●●● patch | view | raw | blame | history
components/picker/companyNature.vue 40 ●●●●● patch | view | raw | blame | history
components/picker/companyTrade.vue 40 ●●●●● patch | view | raw | blame | history
components/picker/education.vue 41 ●●●●● patch | view | raw | blame | history
components/picker/index.vue 3 ●●●● patch | view | raw | blame | history
components/picker/loanUsage.vue 33 ●●●●● patch | view | raw | blame | history
components/picker/maritalStatus.vue 36 ●●●●● patch | view | raw | blame | history
components/picker/monthlyIncome.vue 33 ●●●●● patch | view | raw | blame | history
components/picker/professionInfo.vue 33 ●●●●● patch | view | raw | blame | history
components/picker/provincesCity.vue 3 ●●●●● patch | view | raw | blame | history
components/picker/relation.vue 40 ●●●●● patch | view | raw | blame | history
components/picker/repayTerm.vue 33 ●●●●● patch | view | raw | blame | history
main.js 13 ●●●●● patch | view | raw | blame | history
manifest.json 20 ●●●● patch | view | raw | blame | history
pages/addAddr/addAddr.vue 2 ●●● patch | view | raw | blame | history
pages/addBank/addBank.vue 2 ●●● patch | view | raw | blame | history
pages/address/address.vue 8 ●●●● patch | view | raw | blame | history
pages/bank/bank.vue 8 ●●●● patch | view | raw | blame | history
pages/carts/carts.vue 10 ●●●● patch | view | raw | blame | history
pages/cates/cates.vue 10 ●●●● patch | view | raw | blame | history
pages/catesList/catesList.vue 4 ●●●● patch | view | raw | blame | history
pages/collect/collect.vue 6 ●●●● patch | view | raw | blame | history
pages/customer/customer.vue 4 ●●●● patch | view | raw | blame | history
pages/edu/edu.vue 18 ●●●● patch | view | raw | blame | history
pages/entrust/entrust.vue 10 ●●●● patch | view | raw | blame | history
pages/findpass/findpass.vue 2 ●●● patch | view | raw | blame | history
pages/ginfo/ginfo.vue 14 ●●●● patch | view | raw | blame | history
pages/idcard/idcard.vue 16 ●●●● patch | view | raw | blame | history
pages/index/index.vue 36 ●●●● patch | view | raw | blame | history
pages/job/job.vue 2 ●●● patch | view | raw | blame | history
pages/logs/logs.vue 2 ●●● patch | view | raw | blame | history
pages/my/my.vue 87 ●●●● patch | view | raw | blame | history
pages/order/order.vue 10 ●●●● patch | view | raw | blame | history
pages/orderinfo/orderinfo.vue 8 ●●●● patch | view | raw | blame | history
pages/pays/pays.vue 24 ●●●● patch | view | raw | blame | history
pages/profile/profile.vue 2 ●●● patch | view | raw | blame | history
pages/quanyi/add.vue 4 ●●●● patch | view | raw | blame | history
pages/quanyi/components/code/index.vue 323 ●●●●● patch | view | raw | blame | history
pages/quanyi/components/code/set.vue 323 ●●●●● patch | view | raw | blame | history
pages/regist/regist.vue 2 ●●● patch | view | raw | blame | history
pages/search/search.vue 4 ●●●● patch | view | raw | blame | history
pages/wallet/wallet.vue 2 ●●● patch | view | raw | blame | history
App.vue
@@ -89,13 +89,13 @@
    }
    .noData{
        width: 100%;
        font-size: 28rpx;
        font-size: 28upx;
    }
    .noData image{
        width: 120rpx;
        height: 100rpx;
        width: 120upx;
        height: 100upx;
        display: block;
        margin: 100rpx auto 30rpx;
        margin: 100upx auto 30upx;
    }
    .noData view{
        width: 100%;
@@ -103,13 +103,13 @@
        color: #666666;
    }
    .noDataBtn{
        width: 240rpx !important;
        margin: 50rpx auto;
        width: 240upx !important;
        margin: 50upx auto;
        background-color: #ff7945;
        color: #ffffff !important;
        letter-spacing: 10rpx;
        height: 70rpx;
        line-height: 70rpx;
        border-radius: 50rpx;
        letter-spacing: 10upx;
        height: 70upx;
        line-height: 70upx;
        border-radius: 50upx;
    }
</style>
androidPrivacy.json
@@ -1,7 +1,7 @@
{
    "version" : "1",
    "prompt" : "template",
    "title" : "齐享购商城注册协议和隐私政策",
    "title" : "荔枝商城注册协议和隐私政策",
    "message" : "  请你务必审慎阅读、充分理解“注册协议”和“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>  你可阅读<a href=\"https://www.ncmiruo.com/index/?gp=1 \">《注册协议》</a>和<a href=\"https://www.ncmiruo.com/?gp=2 \">《隐私政策》</a>了解详细信息。并且我们会申请读取您的设备信息,以向您提供安全风控服务。同时您应特别注意前述协议中免除或者限制我们责任的条款、对您权利进行限制的条款。如您已详细阅读并同意金喜易购服务协议和隐私政策,请点击【同意并继续】开始使用我们的服务。",
    "buttonAccept" : "同意并继续",
    "buttonRefuse" : "暂不同意",
components/picker/aliCredit.vue
File was deleted
components/picker/areas.vue
File was deleted
components/picker/companyNature.vue
File was deleted
components/picker/companyTrade.vue
File was deleted
components/picker/education.vue
File was deleted
components/picker/index.vue
@@ -4,9 +4,10 @@
  </view>
</template>
<script>
import {getCityList} from "@/api/modules/user";
import UvPicker from "@/uni_modules/uv-picker/components/uv-picker/uv-picker.vue";
export default {
  components: {UvPicker},
  data() {
    return {
      loading: true,
components/picker/loanUsage.vue
File was deleted
components/picker/maritalStatus.vue
File was deleted
components/picker/monthlyIncome.vue
File was deleted
components/picker/professionInfo.vue
File was deleted
components/picker/provincesCity.vue
@@ -5,7 +5,10 @@
</template>
<script>
import UvPicker from "@/uni_modules/uv-picker/components/uv-picker/uv-picker.vue";
export default {
  components: {UvPicker},
  data() {
    return {
      loading: false,
components/picker/relation.vue
File was deleted
components/picker/repayTerm.vue
File was deleted
main.js
@@ -7,9 +7,6 @@
Vue.config.productionTip = false
App.mpType = 'app'
Vue.prototype.$webHost = 'https://rbb98765.zrgy-bbg.com'
if(process.env.NODE_ENV !== 'production' || window.location.host.includes('test') ){
    Vue.prototype.$webHost = 'https://rbb98765.zrgy-bbg.com'
}
Vue.prototype.$util = util
Vue.prototype.$baseUrl = 'https://tmy.xjzbh.com'
Vue.prototype.$bank = [
@@ -17,7 +14,7 @@
    '中国建设银行',
    '中国银行',
    '中国农业银行',
    '中国邮政储蓄银行',
    '中国邮政储蓄银行',
    '中国交通银行',
    '浦东发展银行',
    '中信银行',
@@ -37,7 +34,7 @@
    '公司企业',
    '政府机关',
    '事业单位',
    '社会组织',
    '社会组织',
    '灵活就业',
]
Vue.prototype.$relation = [
@@ -45,7 +42,7 @@
    '配偶',
    '同事',
    '好友',
    '同学',
    '同学',
    '其他',
]
Vue.prototype.$income = [
@@ -53,7 +50,7 @@
    '5000-10000',
    '10000-20000',
    '20000-30000',
    '30000以上',
    '30000以上',
]
// 全局跳转方法
Vue.prototype.$goWebUrl = function(url) {
@@ -78,4 +75,4 @@
    app
  }
}
// #endif
// #endif
manifest.json
@@ -1,6 +1,6 @@
{
    "name" : "齐享购",
    "appid" : "__UNI__3333B1D",
    "appid" : "__UNI__AEFE893",
    "description" : "",
    "versionName" : "1.3.6",
    "versionCode" : 136,
@@ -148,13 +148,27 @@
                    "description" : "核身服务",
                    "platforms" : "Android,iOS",
                    "url" : "https://ext.dcloud.net.cn/plugin?id=10378",
                    "android_package_name" : "",
                    "ios_bundle_id" : "com.qxg.app",
                    "android_package_name" : "com.zhibaohui.qxg",
                    "ios_bundle_id" : "",
                    "isCloud" : true,
                    "bought" : 1,
                    "pid" : "10378",
                    "parameters" : {}
                }
            },
            "DC-WBNormal" : {
                "__plugin_info__" : {
                    "name" : "DC-WBNormal",
                    "description" : "WB Normal SDK uni-app 插件",
                    "platforms" : "Android",
                    "url" : "https://ext.dcloud.net.cn/plugin?id=1491",
                    "android_package_name" : "com.zhibaohui.qxg",
                    "ios_bundle_id" : "",
                    "isCloud" : true,
                    "bought" : 1,
                    "pid" : "1491",
                    "parameters" : {}
                }
            }
        }
    },
pages/addAddr/addAddr.vue
@@ -27,7 +27,7 @@
        <view class="addrBtn" @tap="addrSave">保存</view>
        <view class="tips">
            <view class="tipsTitle">
                <image src="/static/imgs/notice2.png" ></image>
                <image src="/static/imgs/notice2.png" mode=""></image>
                <text>温馨提示</text>
            </view>
            <view class="tipsDesc">请填写真实有效的收货地址,以便我们提供方便快捷的收货体验。若因地址有误或无故拒收导致退货,以及货品运送期间要求修改地址,<text>从而产生的退回以及转运费用将由用户自行承担,敬请仔细填写。</text></view>
pages/addBank/addBank.vue
@@ -36,7 +36,7 @@
        <view class="addrBtn" @tap="bankSave" v-else>保存</view>
        <view class="tips">
            <view class="tipsTitle">
                <image src="/static/imgs/notice2.png" ></image>
                <image src="/static/imgs/notice2.png" mode=""></image>
                <text>温馨提示</text>
            </view>
            <view class="tipsDesc">
pages/address/address.vue
@@ -8,7 +8,7 @@
                        <text>{{item.phone}}</text>
                    </view>
                    <view class="addr-v">{{item.area}}({{item.addr}})</view>
                    <image class="rgt" src="/static/imgs/right.png" ></image>
                    <image class="rgt" src="/static/imgs/right.png" mode=""></image>
                </view>
                <view class="addr-c">
                    <view class="addr-df">
@@ -18,11 +18,11 @@
                    </view>
                    <view class="addr-c-main">
                        <view class="addr-c-c" @tap="$util.goPages('/pages/addAddr/addAddr?id=' + item.id)">
                            <image src="/static/imgs/edit.png" ></image>
                            <image src="/static/imgs/edit.png" mode=""></image>
                            <text>编辑</text>
                        </view>
                        <view class="addr-c-c" @tap="delConfirm(item.id, index)">
                            <image src="/static/imgs/del.png" ></image>
                            <image src="/static/imgs/del.png" mode=""></image>
                            <text>删除</text>
                        </view>
                    </view>
@@ -30,7 +30,7 @@
            </view>
        </view>
        <view class="noData" v-else>
            <image src="/static/imgs/noData.png" ></image>
            <image src="/static/imgs/noData.png" mode=""></image>
            <view class="">没有地址信息</view>
        </view>
        <view class="addrBtn" @tap="addAddr">添加地址</view>
pages/bank/bank.vue
@@ -7,7 +7,7 @@
                    <text>{{item.phone}}</text>
                </view>
                <view class="bank-v">{{item.bankname}}({{item.bankno}})</view>
                <image class="rgt" src="/static/imgs/right.png" ></image>
                <image class="rgt" src="/static/imgs/right.png" mode=""></image>
                <view class="bank-c">
                    <view class="bank-df">
                        默认:
@@ -16,11 +16,11 @@
                    </view>
                    <view class="bank-c-main">
                        <view class="bank-c-c" @tap="$util.goPages('/pages/addBank/addBank?id=' + item.id)">
                            <image src="/static/imgs/edit.png" ></image>
                            <image src="/static/imgs/edit.png" mode=""></image>
                            <text>编辑</text>
                        </view>
                        <view class="bank-c-c" @tap="delConfirm(item.id, index)">
                            <image src="/static/imgs/del.png" ></image>
                            <image src="/static/imgs/del.png" mode=""></image>
                            <text>删除</text>
                        </view>
                    </view>
@@ -28,7 +28,7 @@
            </view>
        </view>
        <view class="noData" v-else>
            <image src="/static/imgs/noData.png" ></image>
            <image src="/static/imgs/noData.png" mode=""></image>
            <view class="">没有银行卡信息</view>
        </view>
        <view class="bankBtn" @tap="goAdd">添加银行卡</view>
pages/carts/carts.vue
@@ -10,7 +10,7 @@
            <view class="" v-if="cartsData.length > 0">
                <view class="cartsItem" v-for="(item, index) in cartsData">
                    <view class="cartTitle" @tap="cartsClick(item, index)">
                        <image class="cIcon" :src="item.check == 0 ? '/static/imgs/check.png' : '/static/imgs/checked.png'" ></image>
                        <image class="cIcon" :src="item.check == 0 ? '/static/imgs/check.png' : '/static/imgs/checked.png'" mode=""></image>
                        <text>{{item.addtime}}</text>
                    </view>
                    <view class="cartsGoods" @tap="$util.goPages('/pages/ginfo/ginfo?id=' + item.goodsid)">
@@ -33,26 +33,26 @@
                    </view>
                    <view class="carts-nums">
                        <view class="" @tap="setCartsNums(item, 1)">
                            <image src="/static/imgs/minus.png" ></image>
                            <image src="/static/imgs/minus.png" mode=""></image>
                        </view>
                        <view class="">
                            <text>{{item.nums}}</text>
                        </view>
                        <view class="" @tap="setCartsNums(item, 2)">
                            <image src="/static/imgs/add.png" ></image>
                            <image src="/static/imgs/add.png" mode=""></image>
                        </view>
                    </view>
                </view>
            </view>
            <view class="noData" v-else>
                <image src="/static/imgs/noData.png"  style="margin-top: 200rpx;"></image>
                <image src="/static/imgs/noData.png" mode="" style="margin-top: 200upx;"></image>
                <view class="">没有购物车信息</view>
                <view class="noDataBtn" @tap="$util.goSwitch('/pages/cates/cates')">去看看</view>
            </view>
        </view>
        <view class="cartsControll" v-if="cartsData.length > 0">
            <view class="cartsControll-left" @tap="checkTapAll">
                <image class="chooseIcon" :src="checkIds.length == cartsTotal ? '/static/imgs/checked.png' : '/static/imgs/check.png'" ></image>
                <image class="chooseIcon" :src="checkIds.length == cartsTotal ? '/static/imgs/checked.png' : '/static/imgs/check.png'" mode=""></image>
                <text>全选</text>
            </view>
            <view class="cartsControll-right">
pages/cates/cates.vue
@@ -2,7 +2,7 @@
    <view>
        <view class="search">
            <view class="searchView">
                <image src="/static/imgs/search.png" ></image>
                <image src="/static/imgs/search.png" mode=""></image>
                <input type="text" v-model="keyword" placeholder="搜索您想要的商品" @confirm="searchGoods" />
                <view class="searchBtn" @tap="searchGoods">搜索</view>
            </view>
@@ -14,11 +14,11 @@
                    <view v-for="(item, index) in catesData" @click="catesClick(item)" :class="catesId == item.id ? 'active' : ''">{{item.title}}</view>
                </scroll-view>
            </view>
            <view class="cates-right" :style="'width:' + goodsWidth + 'px;height:' + (scrollHeight - 10) + 'px;margin-top: 20rpx'" v-if="goodsData.length > 0">
            <view class="cates-right" :style="'width:' + goodsWidth + 'px;height:' + (scrollHeight - 10) + 'px;margin-top: 20upx'" v-if="goodsData.length > 0">
                <scroll-view scroll-y="true" class="scroll-Y">
                    <view class="goods-list">
                        <view class="goods-item" v-for="(item, index) in goodsData" :style="'width:' + goodsItemWidth + 'px;'" @click="$util.goPages('/pages/ginfo/ginfo?id=' + item.id)">
                            <image class="goods-icon" :src="item.icon" ></image>
                            <image class="goods-icon" :src="item.icon" mode=""></image>
                            <view class="goods-title">{{item.title}}</view>
                            <view class="goods-price">
                                <view>¥</view>
@@ -29,8 +29,8 @@
                </scroll-view>
            </view>
            <view class="noData" v-else>
                <image src="/static/imgs/noData.png" style="margin-left: 50%;" ></image>
                <view class="" style="margin-left: 120rpx; width: auto;">没有商品信息</view>
                <image src="/static/imgs/noData.png" style="margin-left: 50%;" mode=""></image>
                <view class="" style="margin-left: 120upx; width: auto;">没有商品信息</view>
            </view>
            
        </view>
pages/catesList/catesList.vue
@@ -1,6 +1,6 @@
<template>
    <view>
        <view class="goodsData" style="margin-top: 30rpx;">
        <view class="goodsData" style="margin-top: 30upx;">
            <view class="goods-list" v-if="goodsData.length > 0">
                <view class="goods-item" v-for="(itm, idx) in goodsData" @click="$util.goPages('/pages/ginfo/ginfo?id=' + itm.id)">
                    <image lazy-load class="goods-icon" :src="itm.icon" mode="widthFix"></image>
@@ -12,7 +12,7 @@
                </view>
            </view>
            <view class="noData" v-else>
                <image src="/static/imgs/noData.png"  style="margin-top: 200rpx;"></image>
                <image src="/static/imgs/noData.png" mode="" style="margin-top: 200upx;"></image>
                <view class="">没有商品信息</view>
            </view>
        </view>
pages/collect/collect.vue
@@ -11,7 +11,7 @@
        <view class="goods-list" v-if="collectData.length > 0">
            <view class="goods-item" v-for="(item, index) in collectData">
                <view class="" @tap="collectClick(item, index)" v-if="delFlag">
                    <image class="checkImg" :src="item.check == 1 ? '/static/imgs/checked.png' : '/static/imgs/check.png'" ></image>
                    <image class="checkImg" :src="item.check == 1 ? '/static/imgs/checked.png' : '/static/imgs/check.png'" mode=""></image>
                    <view class="msk"></view>
                </view>
                <view class="" @click="$util.goPages('/pages/ginfo/ginfo?id=' + item.goodsid)">
@@ -24,8 +24,8 @@
                </view>
            </view>
        </view>
        <view class="noData" style="margin-top: 250rpx;" v-else>
            <image src="/static/imgs/noData.png" ></image>
        <view class="noData" style="margin-top: 250upx;" v-else>
            <image src="/static/imgs/noData.png" mode=""></image>
            <view class="">没有收藏信息</view>
        </view>
    </view>
pages/customer/customer.vue
@@ -8,11 +8,11 @@
                            <image src="/static/imgs/rsj.png" class="r-icon"></image>
                            {{item.content}}
                        </view>
                        <image class="avatar" v-if="userInfo" :src="$baseUrl + userInfo.avatar" ></image>
                        <image class="avatar" v-if="userInfo" :src="$baseUrl + userInfo.avatar" mode=""></image>
                    </view>
                    
                    <view class="uView" v-else>
                        <image class="avatar" src="/static/imgs/logo.png" ></image>
                        <image class="avatar" src="/static/imgs/logo.png" mode=""></image>
                        <view class="uView-c">
                            <image src="/static/imgs/rsj.png" class="r-icon"></image>
                            {{item.content}}
pages/edu/edu.vue
@@ -1,22 +1,22 @@
<template>
    <view>
        <view class="">
            <image class="edu-icon" src="/static/imgs/edu.png" ></image>
            <image class="edu-icon" src="/static/imgs/edu.png" mode=""></image>
            <view class="edu-desc">额度授信中</view>
            <view class="edu-desc">我们正在加急为您审核,请耐心等待</view>
            <image class="edu-loading" src="/static/imgs/loading.gif" ></image>
            <image class="edu-loading" src="/static/imgs/loading.gif" mode=""></image>
            <view class="edu-over" @tap="$util.goSwitch('/pages/index/index')">认证完成</view>
        </view>
        <!--uni-popup ref="popup" type="center" :is-mask-click="false">
            <view class="popup-content">
                <image class="edu-close" v-if="delFlag" src="/static/imgs/delete.png"  @tap="popClose"></image>
                <image class="edu-icon-1" src="/static/imgs/edu_1.png" ></image>
                <image class="edu-close" v-if="delFlag" src="/static/imgs/delete.png" mode="" @tap="popClose"></image>
                <image class="edu-icon-1" src="/static/imgs/edu_1.png" mode=""></image>
                <view class="edu-view">
                    <view class="edu-view-desc">未匹配到合适的资金方</view>
                    <image class="edu-icon-2" src="/static/imgs/edu_2.png" ></image>
                    <image class="edu-icon-3" src="/static/imgs/edu_3.png" ></image>
                    <image class="edu-icon-2" src="/static/imgs/edu_2.png" mode=""></image>
                    <image class="edu-icon-3" src="/static/imgs/edu_3.png" mode=""></image>
                    <view class="edu-check">
                        <image src="/static/imgs/checked.png" ></image>
                        <image src="/static/imgs/checked.png" mode=""></image>
                        <view class="">
                            我已阅读并同意
                            <text @tap="agreeDialog1">《会服务协议》</text>
@@ -25,10 +25,10 @@
                        </view>
                        
                    </view>
                    <view style="text-align: center;padding-bottom: 20rpx;color: cornflowerblue;" @tap="$util.goPages('/pages/equity/equity')">查看详情>>></view>
                    <view style="text-align: center;padding-bottom: 20upx;color: cornflowerblue;" @tap="$util.goPages('/pages/equity/equity')">查看详情>>></view>
                </view>
                <view class="edu-btn" @tap="buyEquity">
                    <image src="/static/imgs/edu_4.png" ></image>
                    <image src="/static/imgs/edu_4.png" mode=""></image>
                </view>
            </view>
        </uni-popup-->
pages/entrust/entrust.vue
@@ -3,7 +3,7 @@
        <view class="title"></view>
        <view class="title-desc">
            本协议是您作为用户与连云港远屹网络科技有限公司(以下简称为"本公司")之间就其提供的  权益服务所订立的协议,在您签订本协议前,您已经阅读、理解并接受本协议以及各类规则,并承诺遵守中国法律规定,如您不同意,或无法准确理解相关条款的含义,请不要使用服务。您一经使用服务即视为对本协议全部条款已充分理解并完全接受。
            <image class="title-desc-yz" src="/static/imgs/yinzhang.png" ></image>
            <image class="title-desc-yz" src="/static/imgs/yinzhang.png" mode=""></image>
        </view>
        <view class="main">
            <view class="">1.定义与解释</view>
@@ -282,12 +282,12 @@
                <text>身份证:</text>
                <text>360122198910221235</text>
            </view>
            <image class="qshu-yz" src="/static/imgs/yinzhang.png" ></image>
            <image class="qshu-yz" src="/static/imgs/yinzhang.png" mode=""></image>
        </view>
        <view class="company">
            <view class="">连云港远屹网络科技有限公司</view>
            <view class="">2025-06-16</view>
            <image class="company-yz" src="/static/imgs/yinzhang.png" ></image>
            <image class="company-yz" src="/static/imgs/yinzhang.png" mode=""></image>
        </view>
    </view>
</template>
@@ -307,9 +307,9 @@
<style>
.title{
    padding: 20rpx 0;
    padding: 20upx 0;
    text-align: center;
    font-size: 32rpx;
    font-size: 32upx;
    font-weight: 700;
}
.title-desc{
pages/findpass/findpass.vue
@@ -21,7 +21,7 @@
        </view>
        <view class="loginBtn">
            <view class="loginBtn-desc">
                <image @click="agreeClick" class="loginBtn-icon" :src="!loginAct ? '/static/imgs/check.png' : '/static/imgs/checked.png'" ></image>
                <image @click="agreeClick" class="loginBtn-icon" :src="!loginAct ? '/static/imgs/check.png' : '/static/imgs/checked.png'" mode=""></image>
                <text>我已阅读并同意</text>
                <text class="blue" @tap="goAgree(1)">《注册协议》</text>
                <text class="blue" @tap="goAgree(1)">《隐私政策》</text>
pages/ginfo/ginfo.vue
@@ -1,10 +1,10 @@
<template>
    <view>
        <view class="banner">
            <image class="backLeft" src="/static/imgs/blackleft.png"  @click="$util.goBack"></image>
            <image class="backLeft" src="/static/imgs/blackleft.png" mode="" @click="$util.goBack"></image>
            <swiper class="swiper" circular @change="durationChange" :indicator-dots="indicatorDots" :indicator-color="indicatorColor" :autoplay="autoplay" :indicator-active-color="indicatorActiveColor" :interval="interval" :duration="duration">
                <swiper-item v-for="(item, index) in goodsData.banner" :key="index">
                    <image lazy-load :src="item" ></image>
                <swiper-item v-for="(item, index) in goodsData.banner">
                    <image lazy-load :src="item" mode=""></image>
                </swiper-item>
            </swiper>
            <view class="bannerIndex">{{bannerIndex}}/{{goodsData.bannerCount}}</view>
@@ -17,7 +17,7 @@
                <text>积分:{{goodsData.points}}</text>
            </view>
            <view class="collect" @tap="collectGoods">
                <image :src="goodsData.collect == 1 ? '/static/imgs/colls.png' : '/static/imgs/coll.png'" ></image>
                <image :src="goodsData.collect == 1 ? '/static/imgs/colls.png' : '/static/imgs/coll.png'" mode=""></image>
            </view>
        </view>
        <view class="gInfo-title">商品详情</view>
@@ -25,19 +25,19 @@
        <view class="gBtn">
            <view class="gBtn-view" @tap="$util.goSwitch('/pages/index/index')">
                <view class="">
                    <image src="/static/imgs/home.png" ></image>
                    <image src="/static/imgs/home.png" mode=""></image>
                    <view>首页</view>
                </view>
            </view>
            <view class="gBtn-view" @tap="goKefu">
                <view class="">
                    <image src="/static/imgs/message.png" ></image>
                    <image src="/static/imgs/message.png" mode=""></image>
                    <view>客服</view>
                </view>
            </view>
            <view class="gBtn-view" @tap="addCarts">
                <view class="">
                    <image src="/static/imgs/carts.png" ></image>
                    <image src="/static/imgs/carts.png" mode=""></image>
                    <view>购物车</view>
                </view>
            </view>
pages/idcard/idcard.vue
@@ -11,14 +11,14 @@
            <view class="auth-title">
                <text class="auth-title-w">上传身份证</text>
                <view class="auth-tips">
                    <image src="/static/imgs/authtag.png" ></image>
                    <image src="/static/imgs/authtag.png" mode=""></image>
                    <text>信息安全保护中</text>
                </view>
            </view>
            <view class="auth-desc">请上传身份证照片认证,确保照片清晰、四角完整</view>
            <view class="authImg">
                <image class="del" @tap="delImg(1)" src="/static/imgs/delete.png"  v-if="imgzSrc != ''"></image>
                <image @tap="setImg(1)" :src="imgzSrc != '' ? $baseUrl + imgzSrc : '/static/imgs/auth1.png'"  style="border-radius: 10rpx;"></image>
                <image class="del" @tap="delImg(1)" src="/static/imgs/delete.png" mode="" v-if="imgzSrc != ''"></image>
                <image @tap="setImg(1)" :src="imgzSrc != '' ? $baseUrl + imgzSrc : '/static/imgs/auth1.png'" mode="" style="border-radius: 10upx;"></image>
                <view class="authImg-desc">
                    <text>点击上传/拍摄</text>
                    <text>(人头面)</text>
@@ -32,16 +32,16 @@
                </view>
            </view>
            <view class="authImg">
                <image class="del" @tap="delImg(2)" src="/static/imgs/delete.png"  v-if="imgfSrc != ''"></image>
                <image @tap="setImg(2)" :src="imgfSrc != '' ? $baseUrl + imgfSrc : '/static/imgs/auth2.png'"  style="border-radius: 10upx;"></image>
                <image class="del" @tap="delImg(2)" src="/static/imgs/delete.png" mode="" v-if="imgfSrc != ''"></image>
                <image @tap="setImg(2)" :src="imgfSrc != '' ? $baseUrl + imgfSrc : '/static/imgs/auth2.png'" mode="" style="border-radius: 10upx;"></image>
                <view class="authImg-desc">
                    <text>点击上传/拍摄</text>
                    <text>(国徽面)</text>
                </view>
            </view>
            <view class="authImg">
                <image class="del" @tap="delImg(3)" src="/static/imgs/delete.png"  v-if="imgZm != ''"></image>
                <image @tap="setImg(3)" :src="imgZm != '' ? $baseUrl + imgZm : '/static/imgs/zima.png'"  style="border-radius: 10upx;"></image>
                <image class="del" @tap="delImg(3)" src="/static/imgs/delete.png" mode="" v-if="imgZm != ''"></image>
                <image @tap="setImg(3)" :src="imgZm != '' ? $baseUrl + imgZm : '/static/imgs/zima.png'" mode="" style="border-radius: 10upx;"></image>
                <view class="authImg-desc">
                    <text>点击上传/拍摄</text>
                    <text>(芝麻分截图)</text>
@@ -51,7 +51,7 @@
        
        <view class="authBtn">
            <view class="authBtn-desc">
                <image @tap="agreeClick" class="authBtn-icon" :src="!agreeFlag ? '/static/imgs/check.png' : '/static/imgs/checked.png'" ></image>
                <image @tap="agreeClick" class="authBtn-icon" :src="!agreeFlag ? '/static/imgs/check.png' : '/static/imgs/checked.png'" mode=""></image>
                <text>我已阅读并同意</text>
                <text class="blue" @tap="agreeDialog">《实名认证授权书》</text>
            </view>
pages/index/index.vue
@@ -5,20 +5,20 @@
            <view class="index-title">
                <view class="index-title-view index-title-view1">
                    <view class="index-title-view-lf">
                        <image src="@/static/imgs/index-logo.png" mode="widthFix"></image>
                        <image src="@/static/imgs/index-logo.png" mode=""></image>
                    </view>
                    <view class="index-title-view-lf2">趋势好货放心购</view>
                </view>
                <view class="index-title-view index-title-view2">
                    <view class="index-title-view-rf">
                        <view class="">
                            <image src="@/static/imgs/qiandao.png" mode="widthFix"></image>
                            <image src="@/static/imgs/qiandao.png" mode=""></image>
                            <text>签到打卡</text>
                        </view>
                    </view>
                    <view class="index-title-view-rf">
                        <view class="">
                            <image src="@/static/imgs/kefu.png" mode="widthFix"></image>
                            <image src="@/static/imgs/kefu.png" mode=""></image>
                            <text>联系客服</text>
                        </view>
                    </view>
@@ -26,7 +26,7 @@
            </view>
            <view class="search">
                <view class="search-1">
                    <image src="@/static/imgs/s2.png" mode="widthFix"></image>
                    <image src="@/static/imgs/s2.png" mode=""></image>
                    <input type="text" placeholder="请输入关键词" />
                </view>
                <view class="search-2">
@@ -35,7 +35,7 @@
            </view>
            <view class="cates">
                <view class="cates-v" v-for="(item, index) in catesNavData" @tap="$util.goPages('/pages/catesList/catesList?catesId=' + item.id + '&title=' + item.title)">
                    <image class="cates-v-icon" :src="item.icon" mode="scaleToFill"></image>
                    <image class="cates-v-icon" :src="item.icon" mode=""></image>
                    <view class="">{{item.title}}</view>
                </view>
            </view>
@@ -43,20 +43,20 @@
        
        <view class="banner">
            <swiper class="swiper" circular :indicator-dots="indicatorDots" :indicator-color="indicatorColor" :autoplay="autoplay" :indicator-active-color="indicatorActiveColor" :interval="interval" :duration="duration">
                <swiper-item v-for="(item, index) in bannerData"  :key="index" @tap="$util.goPages('/pages/ginfo/ginfo?id=' + item.goodsid)">
                    <image lazy-load :src="item.icon" ></image>
                <swiper-item v-for="(item, index) in bannerData"  @tap="$util.goPages('/pages/ginfo/ginfo?id=' + item.goodsid)">
                    <image lazy-load :src="item.icon" mode=""></image>
                </swiper-item>
            </swiper>
        </view>
        <view class="comm">
            <view class="comm-1">
                <view class="comm-title">
                    <image src="/static/imgs/ptyx.png" mode="widthFix"></image>
                    <image src="/static/imgs/ptyx.png" mode=""></image>
                </view>
                <view class="comm-goods">
                    <view class="comm-goods-v" v-for="(item, index) in prefGoods" @click="$util.goPages('/pages/ginfo/ginfo?id=' + item.id)">
                        <view class="">
                            <image :src="item.icon" mode="widthFix"></image>
                            <image :src="item.icon" mode=""></image>
                            <text>¥{{item.price}}</text>
                        </view>
                    </view>
@@ -65,12 +65,12 @@
            <view class="comm-2"></view>
            <view class="comm-3">
                <view class="comm-title">
                    <image src="@/static/imgs/jfdh.png" mode="widthFix"></image>
                    <image src="@/static/imgs/jfdh.png" mode=""></image>
                </view>
                <view class="comm-goods">
                    <view class="comm-goods-v" v-for="(item, index) in pointGoods" @click="$util.goPages('/pages/ginfo/ginfo?id=' + item.id)">
                        <view class="">
                            <image :src="item.icon" mode="widthFix"></image>
                            <image :src="item.icon" mode=""></image>
                            <text>∮{{item.points}}</text>
                        </view>
                    </view>
@@ -79,16 +79,16 @@
        </view>
        <view class="hots">
            <view class="hots-title" @tap="$util.goPages('/pages/catesList/catesList?is_hot=1&title=热门推荐')">
                <image class="hots-icon" src="@/static/imgs/rmtj.png" mode="widthFix"></image>
                <image class="hots-icon" src="@/static/imgs/rmtj.png" mode=""></image>
                <view class="hots-rgt">
                    <text>大家都在买</text>
                    <image src="@/static/imgs/right.png" mode="widthFix"></image>
                    <image src="@/static/imgs/right.png" mode=""></image>
                </view>
            </view>
            <view class="hots-goods">
                <view class="hots-goods-v" v-for="(item, index) in hotGoods" @click="$util.goPages('/pages/ginfo/ginfo?id=' + item.id)">
                    <view class="">
                        <image :src="item.icon" mode="widthFix"></image>
                        <image :src="item.icon" mode=""></image>
                        <text>¥{{item.price}}</text>
                    </view>
                </view>
@@ -98,13 +98,13 @@
            <view class="goods-main-view">
                <view class="goods-list">
                    <view class="goods-item" v-for="(itm, index) in goodsData" @click="$util.goPages('/pages/ginfo/ginfo?id=' + itm.id)">
                        <image lazy-load class="goods-icon" :src="itm.icon" mode="widthFix"></image>
                        <image lazy-load class="goods-icon" :src="itm.icon" mode=""></image>
                        <view class="goods-title">{{itm.title}}</view>
                        <view class="goods-price">
                            <view>¥</view>
                            <view class="red">{{itm.price}}</view>
                            <view class="hyj">
                                <image src="@/static/imgs/hyj.png" mode="widthFix"></image>
                                <image src="@/static/imgs/hyj.png" mode=""></image>
                            </view>
                            <view>¥</view>
                            <view class="red">{{itm.price}}</view>
@@ -116,9 +116,9 @@
        <uni-popup ref="popup2" type="center" :is-mask-click="false">
            <view class="popup-content">
                <view class="edu-view edu-view2">
                    <image src="/static/imgs/close.png" class="close-edu" mode="widthFix" @tap="$refs.popup2.close()"></image>
                    <image src="/static/imgs/close.png" class="close-edu" mode="" @tap="$refs.popup2.close()"></image>
                    <view class="edu-view-desc2">认证领取额度</view>
                    <image class="edu-icon-succ" src="/static/imgs/auths.png" mode="widthFix"></image>
                    <image class="edu-icon-succ" src="/static/imgs/auths.png" mode=""></image>
                    <view class="edu-view-desc3">
                        请您先认证个人信息,然后立即领取额度
                    </view>
pages/job/job.vue
@@ -125,7 +125,7 @@
        <view class="addrBtn" @tap="jobSave">保存</view>
        <view class="tips">
            <view class="tipsTitle">
                <image src="/static/imgs/notice2.png" ></image>
                <image src="/static/imgs/notice2.png" mode=""></image>
                <text>温馨提示</text>
            </view>
            <view class="tipsDesc">
pages/logs/logs.vue
@@ -11,7 +11,7 @@
            </view>
        </view>
        <view class="noData" v-else>
            <image src="/static/imgs/noData.png" ></image>
            <image src="/static/imgs/noData.png" mode=""></image>
            <view class="">没有账单信息</view>
        </view>
    </view>
pages/my/my.vue
@@ -5,7 +5,7 @@
        <view class="startBar" style="background-color: #e3b400;"></view>
        <view class="myTop">
            <view class="headimg">
                <image :src="userInfo != null ? userInfo.avatar : '/static/imgs/headimg.png'" class="" mode="widthFix" @tap="setImg"></image>
                <image :src="userInfo != null ? userInfo.avatar : '/static/imgs/headimg.png'" class="" mode="" @tap="setImg"></image>
                <view class="">
                    <template>
                        <view v-if="userInfo == null" @tap="$util.goPages('/pages/login/login')">未登录</view>
@@ -38,23 +38,23 @@
            </view>
            <view class="myNavs-view">
                <view class="myNavs-item" @tap="$util.checkLogin('/pages/order/order?status=1')">
                    <image class="myNavs-item-icon" src="/static/imgs/my-n-1.png" mode="widthFix"></image>
                    <image class="myNavs-item-icon" src="/static/imgs/my-n-1.png" mode=""></image>
                    <text class="myNavs-item-text">待支付</text>
                </view>
                <view class="myNavs-item" @tap="$util.checkLogin('/pages/order/order?status=3')">
                    <image class="myNavs-item-icon" src="/static/imgs/my-n-5.png" mode="widthFix"></image>
                    <image class="myNavs-item-icon" src="/static/imgs/my-n-5.png" mode=""></image>
                    <text class="myNavs-item-text">待签约</text>
                </view>
                <view class="myNavs-item" @tap="$util.checkLogin('/pages/order/order?status=4')">
                    <image class="myNavs-item-icon" src="/static/imgs/my-n-2.png" mode="widthFix"></image>
                    <image class="myNavs-item-icon" src="/static/imgs/my-n-2.png" mode=""></image>
                    <text class="myNavs-item-text">待发货</text>
                </view>
                <view class="myNavs-item" @tap="$util.checkLogin('/pages/order/order?status=5')">
                    <image class="myNavs-item-icon" src="/static/imgs/my-n-3.png" mode="widthFix"></image>
                    <image class="myNavs-item-icon" src="/static/imgs/my-n-3.png" mode=""></image>
                    <text class="myNavs-item-text">待收货</text>
                </view>
                <view class="myNavs-item" @tap="$util.checkLogin('/pages/order/order?status=8')">
                    <image class="myNavs-item-icon" src="/static/imgs/my-n-4.png" mode="widthFix"></image>
                    <image class="myNavs-item-icon" src="/static/imgs/my-n-4.png" mode=""></image>
                    <text class="myNavs-item-text">已完成</text>
                </view>
            </view>
@@ -66,36 +66,32 @@
            </view>
            <view class="myServe-view">
                <view class="myServe-item" @tap="$util.checkLogin('/pages/profile/profile')">
                    <image src="/static/imgs/my-s-1.png" mode="widthFix"></image>
                    <image src="/static/imgs/my-s-1.png" mode=""></image>
                    <text>个人信息</text>
                </view>
                <view class="myServe-item" @tap="$util.checkLogin('/pages/logs/logs')" v-if="Config && Config.put_open == 2">
                    <image src="/static/imgs/my-s-2.png" mode="widthFix"></image>
                    <image src="/static/imgs/my-s-2.png" mode=""></image>
                    <text>账单信息</text>
                </view>
                <view class="myServe-item" @tap="$util.checkLogin('/pages/bank/bank')">
                    <image src="/static/imgs/my-s-3.png" mode="widthFix"></image>
                    <image src="/static/imgs/my-s-3.png" mode=""></image>
                    <text>银行卡</text>
                </view>
                <view class="myServe-item" @tap="$util.checkLogin('/pages/address/address')">
                    <image src="/static/imgs/my-s-4.png" mode="widthFix"></image>
                    <image src="/static/imgs/my-s-4.png" mode=""></image>
                    <text>我的地址</text>
                </view>
                <view class="myServe-item" @tap="$util.checkLogin('/pages/collect/collect')">
                    <image src="/static/imgs/my-s-5.png" mode="widthFix"></image>
                    <image src="/static/imgs/my-s-5.png" mode=""></image>
                    <text>我的收藏</text>
                </view>
                <view class="myServe-item" @tap="goKefu">
                    <image src="/static/imgs/my-s-6.png" mode="widthFix"></image>
                    <image src="/static/imgs/my-s-6.png" mode=""></image>
                    <text>联系客服</text>
                </view>
        <view class="myServe-item" @tap="toHuishou" >
          <template v-if="isShop">
            <image src="/static/imgs/quanshou.png" mode="widthFix"></image>
            <text>会员权收</text></template>
        </view>
                <view class="myServe-item" v-if="Config.put_open == 1">
                </view>
            </view>
        </view>
        <view class="myBeiAn">
@@ -110,19 +106,6 @@
        </view>
        <agreePup ref="agreePup1" :gp="1" title="注册协议"></agreePup>
        <agreePup ref="agreePup2" :gp="2" title="隐私政策"></agreePup>
    <uni-popup type="center" ref="comment" >
      <view style="background-image: url('/static/imgs/BOXSDF.png');background-repeat: no-repeat;background-size: 100% 100%">
        <view style="border-radius: 48rpx;padding: 28rpx 20rpx">
          <view style="text-align: center;padding-top: 30rpx;" >
            <image src="/static/imgs/wuImg.png" style="width: 372rpx;height: 240rpx;"></image>
          </view>
          <view style="font-size: 32rpx;font-weight: 600;color: #333333;text-align: center;margin-top: 34rpx;margin-bottom: 80rpx;padding: 0 28rpx;">{{errState}}</view>
          <view @click="$refs.comment.close()" style="font-weight: 500;font-size: 32rpx;color: #fff;text-align: center;padding: 24rpx 28rpx;border-top: 2rpx solid #EEEEEE;background: #FF1472;;border-radius: 40rpx ;">好的</view>
        </view>
      </view>
    </uni-popup>
    </view>
</template>
@@ -137,49 +120,15 @@
            return {
                userInfo: this.$util.getUserInfo(),
                Config: {put_open: 1},
        isShop:false,
        errState:''
            }
        },
    onLoad() {
        onLoad() {
        },
    async onShow() {
        onShow() {
            this.getConfig()
            this.getUserInfo()
      const _this = this;
      if(_this.$util.getUserInfo()?.phone){
        await uni.request({
          url: _this.$webHost+'/api/v2/auth/qxgIosUnionLogin?phone='+_this.$util.getUserInfo().phone,
          success: function (res) {
            _this.isShop = res.data.data.isShop;
          }
        })
      }
        },
        methods: {
      toHuishou(){
        const _this = this;
        if(!_this.isShop){
          return
        }
        uni.request({
          url: _this.$webHost+'/api/v2/customer/ryxIsBuyEquity?phone='+_this.$util.getUserInfo().phone,
          success: function (res) {
            if(res.data.code==200){
              uni.navigateTo( {
                url: '/pages/quanshou/index'
              })
            } else {
              _this.errState = res.data.data;
              _this.$refs.comment.open()
            }
          }
        })
      },
            goKefu() {
                if(this.Config && this.Config.kefu_open == 1) {
                    this.wechatWork()
@@ -238,7 +187,7 @@
            getUserInfo () {
                let t = this
                t.$util.post('User/getUser').then(res => {
          t.userInfo = res.data
                    t.userInfo = res.data
                })
            },
            agreeDialog1 (e) {
pages/order/order.vue
@@ -71,7 +71,7 @@
                </view>
            </view>
            <view class="noData" v-else>
                <image src="/static/imgs/noData.png"  style="margin-top: 200upx;"></image>
                <image src="/static/imgs/noData.png" mode="" style="margin-top: 200upx;"></image>
                <view class="">没有订单信息</view>
                <view class="noDataBtn" @tap="$util.goSwitch('/pages/index/index')">去看看</view>
            </view>
@@ -97,8 +97,8 @@
                    <view class="pop-main-view" v-for="(item, index) in planData">
                        <view class="pop-pay" style="width: 100%;">
                            <view class="" @tap="planClick(item)" style="padding: 10upx 0;">
                                <image v-if="planId == item.id" src="/static/imgs/checked.png" ></image>
                                <image v-else src="/static/imgs/check.png" ></image>
                                <image v-if="planId == item.id" src="/static/imgs/checked.png" mode=""></image>
                                <image v-else src="/static/imgs/check.png" mode=""></image>
                                <text>日期:{{item.paydate}}</text>
                                <text style="margin-left: 30upx;">还款金额:{{item.total}}</text>
                                <text style="margin-left: 30upx;">({{item.statusName}})</text>
@@ -117,11 +117,11 @@
                    <view class="pop-main-view">
                        <view class="pop-pay" style="width: 100%;border-bottom: none;">
                            <view class="pay-item" style="border-bottom: 1px solid #eeeeee;padding: 20upx 20upx 30upx 20upx;" @tap="payback(2)">
                                <image class="pay-icon" src="/static/imgs/wxpay.png" ></image>
                                <image class="pay-icon" src="/static/imgs/wxpay.png" mode=""></image>
                                <text>微信还款({{payTotal}}元)</text>
                            </view>
                            <view class="pay-item" style="padding: 20upx;border-bottom: none;" @tap="payback(3)">
                                <image class="pay-icon" src="/static/imgs/bankpay.png" style="height: 40upx; margin-right: 10upx;" ></image>
                                <image class="pay-icon" src="/static/imgs/bankpay.png" style="height: 40upx; margin-right: 10upx;" mode=""></image>
                                <view>
                                    <text>银行卡还款({{payTotal}}元)</text>
                                </view>
pages/orderinfo/orderinfo.vue
@@ -111,8 +111,8 @@
                    <view class="pop-main-view" v-for="(item, index) in planData">
                        <view class="pop-pay" style="width: 100%;">
                            <view class="" @tap="planClick(item)" style="padding: 10upx 0;">
                                <image v-if="planId == item.id" src="/static/imgs/checked.png" ></image>
                                <image v-else src="/static/imgs/check.png" ></image>
                                <image v-if="planId == item.id" src="/static/imgs/checked.png" mode=""></image>
                                <image v-else src="/static/imgs/check.png" mode=""></image>
                                <text>日期:{{item.paydate}}</text>
                                <text style="margin-left: 30upx;">还款金额:{{item.total}}</text>
                                <text style="margin-left: 30upx;">({{item.statusName}})</text>
@@ -131,11 +131,11 @@
                    <view class="pop-main-view">
                        <view class="pop-pay" style="width: 100%;border-bottom: none;">
                            <view class="pay-item" style="border-bottom: 1px solid #eeeeee;padding: 20upx 20upx 30upx 20upx;" @tap="payback(2)">
                                <image class="pay-icon" src="/static/imgs/wxpay.png" ></image>
                                <image class="pay-icon" src="/static/imgs/wxpay.png" mode=""></image>
                                <text>微信还款({{payTotal}}元)</text>
                            </view>
                            <view class="pay-item" style="padding: 20upx;border-bottom: none;" @tap="payback(3)">
                                <image class="pay-icon" src="/static/imgs/bankpay.png" style="height: 40upx; margin-right: 10upx;" ></image>
                                <image class="pay-icon" src="/static/imgs/bankpay.png" style="height: 40upx; margin-right: 10upx;" mode=""></image>
                                <view>
                                    <text>银行卡还款({{payTotal}}元)</text>
                                </view>
pages/pays/pays.vue
@@ -1,7 +1,7 @@
<template>
    <view class="pays">
        <view class="addr" @tap="chooseAddr">
            <image class="addrImg" src="/static/imgs/my-s-4.png" ></image>
            <image class="addrImg" src="/static/imgs/my-s-4.png" mode=""></image>
            <view class="addrView">
                <template v-if="addrData">
                    <view class="">
@@ -14,11 +14,11 @@
                    <view class="" style="margin-top: 20upx;">请选择收货地址</view>
                </template>
            </view>
            <image class="rgt" src="/static/imgs/right.png" ></image>
            <image class="rgt" src="/static/imgs/right.png" mode=""></image>
        </view>
        <view class="goods">
            <view class="goodsMain" v-for="(item, index) in cartsData">
                <image class="goods-icon" :src="item.icon" ></image>
                <image class="goods-icon" :src="item.icon" mode=""></image>
                <view class="goods-info">
                    <view class="goods-title">{{item.title}}</view>
                    <view class=""></view>
@@ -32,13 +32,13 @@
                    </view>
                    <view class="carts-nums">
                        <view class="" @tap="setCartsNums(item, 1)">
                            <image src="/static/imgs/minus.png" ></image>
                            <image src="/static/imgs/minus.png" mode=""></image>
                        </view>
                        <view class="">
                            <text>{{item.nums}}</text>
                        </view>
                        <view class="" @tap="setCartsNums(item, 2)">
                            <image src="/static/imgs/add.png" ></image>
                            <image src="/static/imgs/add.png" mode=""></image>
                        </view>
                    </view>
                </view>
@@ -64,28 +64,28 @@
            </view>
            <view class="pay-li">
                <view class="pay-item" @tap="choosePayment(1)" v-if="Config && Config.edu_open == 1 && isFenqi == 1">
                    <image class="pay-icon" src="/static/imgs/edupay.png" ></image>
                    <image class="pay-icon" src="/static/imgs/edupay.png" mode=""></image>
                    <text v-if="userInfo">余额支付(可用余额:{{userInfo.const}})</text>
                    <image class="rgt" :src="payment == 1 ? '/static/imgs/checked.png' : '/static/imgs/check.png'" ></image>
                    <image class="rgt" :src="payment == 1 ? '/static/imgs/checked.png' : '/static/imgs/check.png'" mode=""></image>
                </view>
                <view class="pay-item" @tap="choosePayment(2)">
                    <image class="pay-icon" src="/static/imgs/wxpay.png" ></image>
                    <image class="pay-icon" src="/static/imgs/wxpay.png" mode=""></image>
                    <text>微信支付</text>
                    <image class="rgt" :src="payment == 2 ? '/static/imgs/checked.png' : '/static/imgs/check.png'" ></image>
                    <image class="rgt" :src="payment == 2 ? '/static/imgs/checked.png' : '/static/imgs/check.png'" mode=""></image>
                </view>
                <view class="pay-item">
                    <image class="pay-icon" src="/static/imgs/bankpay.png" ></image>
                    <image class="pay-icon" src="/static/imgs/bankpay.png" mode=""></image>
                    <view @tap="chooseBank">
                        <text>银行卡支付</text>
                        <text v-if="bankData">({{bankData.bankno}}切换)</text>
                        <text v-else>(请选择银行卡 》》)</text>
                    </view>
                    <image class="rgt" :src="payment == 3 ? '/static/imgs/checked.png' : '/static/imgs/check.png'"  @tap="choosePayment(3)"></image>
                    <image class="rgt" :src="payment == 3 ? '/static/imgs/checked.png' : '/static/imgs/check.png'" mode="" @tap="choosePayment(3)"></image>
                </view>
            </view>
        </view>
        <view class="authBtn-desc" v-if="userInfo && payment == 1 && userInfo.edu_auth == 1">
            <image @tap="agreeFlag = !agreeFlag" class="authBtn-icon" :src="!agreeFlag ? '/static/imgs/check.png' : '/static/imgs/checked.png'" ></image>
            <image @tap="agreeFlag = !agreeFlag" class="authBtn-icon" :src="!agreeFlag ? '/static/imgs/check.png' : '/static/imgs/checked.png'" mode=""></image>
            <text>我已阅读并同意</text>
            <text class="blue" @tap="eSignAgree">《赊销购货协议》(点击签署)</text>
        </view>
pages/profile/profile.vue
@@ -6,7 +6,7 @@
            <view class="profile-item">
                <text class="label">头像(点击更换)</text>
                <view class="" @tap="setImg">
                    <image :src="$baseUrl + userInfo.avatar" ></image>
                    <image :src="$baseUrl + userInfo.avatar" mode=""></image>
                </view>
            </view>
            <view class="profile-item">
pages/quanyi/add.vue
@@ -2,8 +2,8 @@
import offIcon from '@/static/imgs/icons/off.png'
import leftIcon from  '@/static/imgs/icons/left.png'
import kkIcon from  '@/static/imgs/icons/kk.png'
import addAddress from "./components/addAddress";
import agreement from "./components/agreement";
import addAddress from "@/pages/quanyi/components/addAddress";
import agreement from "@/pages/quanyi/components/agreement";
export default {
  name: "add",
  components: {
pages/quanyi/components/code/index.vue
File was deleted
pages/quanyi/components/code/set.vue
File was deleted
pages/regist/regist.vue
@@ -21,7 +21,7 @@
        </view>
        <view class="loginBtn">
            <view class="loginBtn-desc">
                <image @click="agreeClick" class="loginBtn-icon" :src="!loginAct ? '/static/imgs/check.png' : '/static/imgs/checked.png'" ></image>
                <image @click="agreeClick" class="loginBtn-icon" :src="!loginAct ? '/static/imgs/check.png' : '/static/imgs/checked.png'" mode=""></image>
                <text>我已阅读并同意</text>
                <text class="blue" @tap="agreeDialog1">《注册协议》</text>
                <text class="blue" @tap="agreeDialog2">《隐私政策》</text>
pages/search/search.vue
@@ -3,7 +3,7 @@
        <view class="search">
            <view class="searchView">
                <span class="back" @tap="$util.goSwitch('/pages/index/index')">返回</span>
                <image src="/static/imgs/search.png" ></image>
                <image src="/static/imgs/search.png" mode=""></image>
                <input type="text" v-model="keyword" placeholder="搜索您想要的商品" @confirm="searchGoods" />
                <view class="searchBtn" @tap="searchGoods">搜索</view>
            </view>
@@ -15,7 +15,7 @@
                    <view class="" v-for="(item, index) in keywordData" v-if="index <= 19" @tap="keywordSearch(item)">{{item}}</view>
                </view>
                <view class="noData" v-else>
                    <image src="/static/imgs/noData.png"  style="margin-top: 200upx;"></image>
                    <image src="/static/imgs/noData.png" mode="" style="margin-top: 200upx;"></image>
                    <view class="">没有搜索记录</view>
                </view>
            </view>
pages/wallet/wallet.vue
@@ -16,7 +16,7 @@
            <view class="wallet-goods-title">热门商品</view>
            <view class="goods-list">
                <view class="goods-item" v-for="(itm, idx) in goodsData" @click="$util.goPages('/pages/ginfo/ginfo?id=' + itm.id)">
                    <image lazy-load class="goods-icon" :src="itm.icon" ></image>
                    <image lazy-load class="goods-icon" :src="itm.icon" mode=""></image>
                    <view class="goods-title">{{itm.title}}</view>
                    <view class="goods-price">
                        <view>¥</view>