diff --git a/App.vue b/App.vue index 4e0936f..abbeb17 100644 --- a/App.vue +++ b/App.vue @@ -86,15 +86,7 @@ } // #ifdef APP-PLUS - //监听uni小程序发送的事件 - mp.onUniMPEventReceive(ret => { - console.log('小程序事件: ', ret); - if (ret.event == 'closeApp') { - mp.closeUniMP(ret.fromAppid, (ret) => { - console.log('closeUniMP: ' + JSON.stringify(ret)); - }); - } - }); + // #endif let that = this; diff --git a/api/api.js b/api/api.js index 7d9d20c..c382e10 100644 --- a/api/api.js +++ b/api/api.js @@ -305,3 +305,8 @@ export function paymerchant() { export function merchant(data) { return request.get(`store/merchant/margin`, data); } + +//获取保证金缴纳列表 +export function marginlist(data) { + return request.get(`user/margin/list`,data); +} diff --git a/api/store.js b/api/store.js index 2a8ae0f..3659801 100644 --- a/api/store.js +++ b/api/store.js @@ -579,4 +579,7 @@ export function vicinityStoreApi(data) { */ export function agreeiness(data) { return request.get(`business/agree`, data, { noAuth: true }); -} \ No newline at end of file +} + + + diff --git a/api/user.js b/api/user.js index 0009c40..4594d26 100644 --- a/api/user.js +++ b/api/user.js @@ -8,6 +8,8 @@ // | Author: CRMEB Team // +---------------------------------------------------------------------- import request from "@/utils/request.js"; + +import request1 from "@/utils/requestb.js"; import Cache from '@/utils/cache' /** * 获取版本信息 @@ -721,3 +723,10 @@ export function getBillDetil() { return request.get(`mer/financial_record`) } + + +//获取商户入驻所签署公司 + +export function merstreet(data) { + return request1.get(`company/street_company`, data); +} diff --git a/config/app.js b/config/app.js index e98668d..5537476 100644 --- a/config/app.js +++ b/config/app.js @@ -6,37 +6,37 @@ let openPlantGrass = '-openPlantGrass-' let httpApi let httpApiTwo let httpApiThree -// 网络接口修改此字符 小程序域名要求https -// let httpApi = 'http://192.168.31.110:8324' // 测试 -if (process.env.NODE_ENV === "development") { - // httpApi = 'https://shop.lihaink.cn' // 生产 - // httpApi = 'https://test.shop.lihaink.cn' //预发布环境 - - httpApi = "https://crmeb-test.shop.lihaink.cn" - // httpApi = "http://192.168.0.222" - // httpApi = "http://192.168.0.108:8325" - // httpApi = 'http://192.168.0.108:8325' - // #ifdef MP-WEIXIN - httpApiTwo = "https://nk.lihaink.cn" - httpApiThree = 'http://ceshi-oa.lihaink.cn' - // #endif - // #ifdef H5 - // httpApiTwo = "baseUrl" // h5跨域配置 - httpApiTwo = "https://nk.lihaink.cn" // h5跨域配置 - // httpApiThree = 'baseUrlTest' // h5跨域配置 + +// 在打包之前请检查当前环境是否正确 +const env = 'dev'; // 开发 + +// const env = 'prod'; // 生产 +// const env = 'prew'; // 预上线 + +switch (env) { - // #endif -} else if (process.env.NODE_ENV === 'production') { - // httpApi = 'https://shop.lihaink.cn' // 生产 - - httpApi ='https://test.shop.lihaink.cn' //预发布环境 - - // httpApi = "https://crmeb-test.shop.lihaink.cn" - httpApiTwo = 'https://nk.lihaink.cn' // 生产 - httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产 + case 'prod': + httpApi = 'https://shop.lihaink.cn' // 生产 + httpApiTwo = 'https://nk.lihaink.cn' + httpApiThree = 'http://ceshi-oa.lihaink.cn' + httpApiFour = 'https://worker-task.lihaink.cn' + break; + case 'prew': + httpApi = 'https://test.shop.lihaink.cn' //预发布环境 + httpApiTwo = "https://nk.lihaink.cn" + httpApiThree = 'http://ceshi-oa.lihaink.cn' + httpApiFour = 'https://preview-worker-task.lihaink.cn' + break; + + default: + httpApi = "https://crmeb-test.shop.lihaink.cn" // 测试 + httpApiTwo = "https://nk.lihaink.cn" + httpApiThree = 'http://ceshi-oa.lihaink.cn' + httpApiFour = 'https://ceshi-worker-task.lihaink.cn' } -// httpApi = 'https://shop.lihaink.cn' // 生产 -// httpApiTwo = 'https://nk.lihaink.cn' // 生产 + + + // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer.crmeb.net // let wsApi = 'ws://192.168.3.20:8324' @@ -49,11 +49,13 @@ module.exports = { HTTP_REQUEST_URL: httpApi, HTTP_REQUEST_URL_TWO: httpApiTwo, HTTP_REQUEST_URL_THREE: httpApiThree, + HTTP_REQUEST_URL_FOUR: httpApiFour, VUE_APP_WS_URL: `${wsApi}?type=user`, // #endif - + // #ifdef H5 //H5接口是浏览器地址 + HTTP_REQUEST_URL_FOUR: httpApiFour|| window.location.protocol + "//" + window.location.host, HTTP_REQUEST_URL: httpApi || window.location.protocol + "//" + window.location.host, HTTP_REQUEST_URL_TWO: httpApiTwo || window.location.protocol + "//" + window.location.host, // 聊天长连接地址 diff --git a/manifest.json b/manifest.json index da3dd97..4d5842c 100644 --- a/manifest.json +++ b/manifest.json @@ -1,9 +1,9 @@ { - "name" : "惠农生活", - "appid" : "__UNI__3A527D1", + "name" : "惠农商户平台", + "appid" : "__UNI__1EE148C", "description" : "", - "versionName" : "1.3.9", - "versionCode" : 139, + "versionName" : "1.0.1", + "versionCode" : 101, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index 5ddca50..c4d3cf7 100644 --- a/pages.json +++ b/pages.json @@ -99,7 +99,15 @@ "navigationBarTitleText": "商品管理", "navigationStyle": "custom" } - } + },{ + "path" : "pages/margin/margin", + "style" : + { + "navigationBarTitleText": "保证金缴纳", + "enablePullDownRefresh": false + } + + } // { // "path": "pages/gather/gather", diff --git a/pages/index/index.vue b/pages/index/index.vue index b6877c2..c1f47b4 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -4,20 +4,22 @@ - + + + - + - {{userInfoData.mer_info.mer_name}} + {{userInfoData.mer_info.mer_name?userInfoData.mer_info.mer_name:'暂无信息'}} - + 请登录 @@ -56,7 +58,7 @@ - + {{item.value}} @@ -110,10 +112,8 @@ 待发货 - - @@ -177,9 +177,154 @@ + + + + + + + + + + + {{userInfoData.account}} + + + + {{userInfoData.mer_info.mer_name}} + + + + + + + + 退出 + + + + + + + + + + +
{{detail.title}}
+ 甲方公司:{{company?company:"暂无公司信息"}} + 机构代码:{{organization_code?organization_code:"暂无公司信息"}} + + + + + + + + + + + + + + + + + + +
+ + 填写信息 + + + + 开户行名称: + + + + + + + + 联系电话: + + + + + + + 开户行: + + + + + + 身份证正面: + + + + + + + + + + + + + + + + + + + + + 银行卡反面: + + + + + + + + + + + + + + + + + + + + + + +
+ + @@ -188,8 +333,14 @@ import ordertime from './component/timelist.vue' import retuntop from '@/components/content-top/index.vue'; import { + merstreet, getUserInfo } from '@/api/user.js'; + import { + business, + intention, + intentionbus + } from "@/api/product" import image from '../../uni_modules/uview-ui/libs/config/props/image'; import { orderStatistics, @@ -220,18 +371,23 @@ }], order: [{ name: '待付款', + type: 1, value: 0 }, { name: '待发货', + type: 2, value: 0 }, { name: '待收货', + type: 3, value: 0 }, { name: '待评价', + type: 4, value: 0 }, { name: '退款', + type: 6, value: 0 }], @@ -272,7 +428,8 @@ ], - + company: '', + organization_code: '', show: false, where: { @@ -293,7 +450,24 @@ isshow: false, where1: { product_type: 0 - } + }, + codenote: [], + validate: false, + merchantData: { + bank_username: '', + bank_opening: '', + bank_front: '', + bank_back: '', + cardno_front: '', + cardno_back: '' + }, + Fheight: 0, + isFshow: false, + detail: {}, + tagStyle: { + img: 'width:100%;display:block;' + }, + num: 10 } }, @@ -303,11 +477,9 @@ }, onLoad() { - this.selfLocation() this.getUserInfo() - - - + this.list1() + this.Fheight = uni.getSystemInfoSync().windowHeight + 'px'; }, @@ -325,8 +497,8 @@ mounted() { - this.selfLocation() + this.list1() }, onShow() { @@ -338,12 +510,265 @@ this.$bus.$off('value-updated') }, methods: { + //关闭弹窗 + close() { + this.$refs.popup.close() + this.num = 15 + }, + //获取交易信息 + codelist() { + intention(this.where).then(res => { + this.codenote = res.data.list + }) + }, + //跳转订单 + shopporder(item) { + if (this.userid) { + switch (item.type) { + case 1: + uni.navigateTo({ + url: '/pages/admin/orderList/index?mer_id=' + this.userInfoData.service.mer_id + + '&types=' + item.type + }) + break; + case 2: + + uni.navigateTo({ + url: '/pages/admin/orderList/index?mer_id=' + this.userInfoData.service.mer_id + + '&types=' + item.type + }) + break; + case 3: + uni.navigateTo({ + url: '/pages/admin/orderList/index?mer_id=' + this.userInfoData.service.mer_id + + '&types=' + item.type + }) + break; + case 4: + uni.navigateTo({ + url: '/pages/admin/orderList/index?mer_id=' + this.userInfoData.service.mer_id + + '&types=' + item.type + + }) + break; + case 6: + uni.navigateTo({ + url: '/pages/admin/orderList/index?mer_id=' + this.userInfoData.service.mer_id + + '&types=' + item.type + + }) + break; + + } + + + } else { + this.isAuto = true; + this.isShowAuth = true + } + }, + //提交 + formSubmit: function(e) { + let that = this; + if (that.validateForm() && that.validate) { + + that.validate = false; + + intentionbus(that.merchantData).then(res => { + if (res.status == 200) { + this.$refs.popup.close() + that.$util.Tips({ + title: '提交成功' + }); + this.codelist() + that.timer = setTimeout(() => { + that.successful = true; + that.validate = true; + }, 1000) + + } + }).catch(res => { + that.validate = true; + this.num = 15 + this.$refs.popup.close() + that.$util.Tips({ + title: res + }); + }) + + + } + + }, + //同意 + agree() { + this.$refs.popup.open() + this.isFshow = false + + }, + //拒绝 + refuse() { + this.isFshow = false + }, + //关闭弹窗 + recuo() { + + if (this.num > 0) { + this.num = 15 + this.isFshow = false + } else { + this.num = 15 + this.isFshow = false + } + }, + + countDown() { + let { + num + } = this; + // if (num === 3) this.nums = true; + num = num > 0 ? num - 1 : "0"; + setTimeout(() => { + + this.num = num; + if (num == '0') { + // this.launchApp() + return + } + + if (this.isFshow == false && this.num > 0) { + this.num = 15 + return + } + this.countDown(); + }, 1000); + + + }, + //验证 + validateBtn: function() { + let that = this, + value = that.merchantData; + if (value.bank_username && value.bank_opening) { + if (!that.isShowCode) { + that.validate = true; + } else { + if (that.codeVal) { + that.validate = true; + } else { + that.validate = false; + } + } + } else { + that.validate = false; + } + }, + validateForm: function() { + let that = this, + value = that.merchantData; + + if (!value.bank_username) return that.$util.Tips({ + title: '请输入银行账户姓名' + }); + if (!value.bank_opening) return that.$util.Tips({ + title: '请输入开户行' + }); + + if (value.bank_front.length == 0) return that.$util.Tips({ + title: '请上传一张或者多张图片' + }); + + if (value.bank_back.length == 0) return that.$util.Tips({ + title: '请上传一张或者多张图片' + }); + if (value.cardno_front.length == 0) return that.$util.Tips({ + title: '请上传一张或者多张图片' + }); + if (value.cardno_back.length == 0) return that.$util.Tips({ + title: '请上传一张或者多张图片' + }); + that.validate = true; + return true; + }, + /** + * 上传文件 + * + */ + uploadpic(data) { + let that = this; + if (data.type == 1) { + that.$util.uploadImageOne('upload/image', function(res) { + that.merchantData.cardno_front = res.data.path + + }); + } else if (data.type == 2) { + that.$util.uploadImageOne('upload/image', function(res) { + that.merchantData.cardno_back = res.data.path + + }); + } else if (data.type == 3) { + that.$util.uploadImageOne('upload/image', function(res) { + that.merchantData.bank_front = res.data.path + + }); + } else { + that.$util.uploadImageOne('upload/image', function(res) { + that.merchantData.bank_back = res.data.path + + }); + } + + }, + //删除图片 + DelPic(data) { + let that = this; + if (data.type == 1) { + + that.merchantData.cardno_front = '' + + + } else if (data.type == 2) { + + that.merchantData.cardno_back = '' + + + } else if (data.type == 3) { + + that.merchantData.bank_front = '' + + + } else { + + that.merchantData.bank_back = '' + + + } + + }, + + + //个人详情 + + logout() { + this.$refs.popup1.open() + }, + + //登录 login() { uni.redirectTo({ url: '/pages/users/login/login_copy' }) }, + //获取协议内容 + list1() { + business({ + type: 'mer_settlement_agree' + }).then(res => { + this.detail = res.data + }) + }, + //跳转 shopp() { if (this.userInfoData.mer_info.type_id == 12) { uni.navigateTo({ @@ -404,11 +829,33 @@ */ getUserInfo() { getUserInfo().then(res => { - console.log(res) + this.userid = res.data.uid this.userInfoData = res.data - this.getGoods(true) - this.getindex() + + if (res.data.mer_info.length == 0) { + uni.showModal({ + title: '暂无商户信息' + }) + } else { + this.getindex() + this.getGoods(true) + } + + merstreet({ + street_code: res.data.mer_info.street_id + }).then((res) => { + if (res.code == 0) { + // this.$util.Tips({ + // title: res.msg + // }); + return false; + } + this.company = res.data.title + this.organization_code = res.data.organization_code + }).catch(res => { + console.log(res) + }) }); }, @@ -418,59 +865,109 @@ }, //路由跳转 navation(item) { + if (this.userid) { + if (this.userInfoData.mer_info.setting_status == 1) { + switch (item.type) { + case 1: + uni.switchTab({ + url: '/pages/product/list/index' + }) + break; + case 2: + uni.navigateTo({ + url: '/pages/admin/order/index?mer_id=' + this.userInfoData.service.mer_id + + '&type_id=' + this.userInfoData.mer_info.type_id + }) + break; + case 3: + uni.navigateTo({ + url: '/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=' + + this.userInfoData.mer_info.category_id + }) + break; + case 4: + uni.navigateTo({ + url: '/pages/users/order_list/index?status=-1' - switch (item.type) { - case 1: + }) + break; + case 5: + uni.navigateTo({ + url: '/pages/users/embody/embody?mer_id=' + this.userInfoData.service.mer_id + + }) + break; + case 6: + uni.switchTab({ + url: '/pages/chat/customer_list/index?type=1&mer_id=' + this.userInfoData + .service + .mer_id + }) + break; + case 7: + uni.navigateTo({ + url: '/pages/admin/order_cancellation/index?mer_id=' + this.userInfoData + .service + .mer_id + + }) + break; + case 8: + uni.navigateTo({ + url: '/pages/moreProject/moreProject' + }) + break; + } + + } else { + if (this.userInfoData.mer_info.mer_name) { + if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) { + + + if (this.codenote.length == 0) { + this.isFshow = true + this.countDown() + } else { + if (this.codenote[0].status == 0) { + uni.showModal({ + title: '申请正在审核中，请勿重复提交' + }) + } else { + this.isFshow = true + this.countDown() + } + } + } else { + + uni.navigateTo({ + url: url + }) + } + } else { + + uni.showModal({ + title: '提示', + content: '请完成商户设置后，再进行本次操作', + success: function(res) { + if (res.confirm) { + uni.navigateTo({ + url: '/pages/product/basicSet?mer_id=' + this.userInfoData + .service + .mer_id + }) + } else if (res.cancel) { + console.log('用户点击取消'); + } + } - uni.switchTab({ - url: '/pages/product/list/index' - }) - break; - case 2: - uni.navigateTo({ - url: '/pages/admin/order/index?mer_id=' + this.userInfoData.service.mer_id + - '&type_id=' + this.userInfoData.mer_info.type_id }) - break; - case 3: - uni.navigateTo({ - url: '/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=' + - this.userInfoData.mer_info.category_id - }) - break; - case 4: - uni.navigateTo({ - url: '/pages/users/order_list/index?status=-1' - }) - break; - case 5: - uni.navigateTo({ - url: '/pages/users/embody/embody?mer_id=' + this.userInfoData.service.mer_id + } - }) - break; - case 6: - uni.switchTab({ - url: '/pages/chat/customer_list/index?type=1&mer_id=' + this.userInfoData.service - .mer_id - }) - break; - case 7: - uni.navigateTo({ - url: '/pages/admin/order_cancellation/index?mer_id=' + this.userInfoData.service - .mer_id - - }) - break; - case 8: - uni.navigateTo({ - url: '/pages/moreProject/moreProject' - }) - break; } + } else { this.isAuto = true; this.isShowAuth = true @@ -507,29 +1004,6 @@ }); }, - selfLocation() { - - - uni.getLocation({ - type: 'wgs84', - timeout: '1000', - success: (res) => { - - this.isshow = false - let latitude, longitude; - latitude = res.latitude.toString(); - longitude = res.longitude.toString(); - - }, - fail: (err) => { - - - } - }); - } - - - } } @@ -542,6 +1016,445 @@ /deep/.statistical-page .navs { top: 400rpx !important; + + } + + .userpage { + width: 100%; + + + background-color: #fff; + position: relative; + } + + .userpage-icon { + width: 60rpx; + height: 60rpx; + position: absolute; + top: 85rpx; + right: 60rpx; + + image { + width: 100%; + height: 100%; + } + } + + .item-name { + width: 190rpx; + } + + .merchantsSettled { + height: 100%; + padding-top: 160rpx; + } + + .merchantsSettled .title { + font-size: 35rpx; + font-family: Microsoft YaHei; + font-weight: 400; + text-align: center; + } + + .merchantsSettled .list { + background-color: #fff; + border-radius: 12px; + margin: 0 15px; + position: absolute; + } + + .application-record { + position: absolute; + display: flex; + align-items: center; + top: 240rpx; + right: 0; + color: #fff; + font-size: 22rpx; + background-color: rgba(0, 0, 0, 0.3); + padding: 8rpx 18rpx; + border-radius: 20px 0px 0px 20px; + } + + .item-card { + display: flex; + margin-top: 20rpx; + + .item-carda { + width: 298rpx; + height: 175rpx; + margin-right: 20rpx; + + image { + width: 100%; + height: 100%; + } + } + + .item-cardb { + width: 298rpx; + height: 175rpx; + + image { + width: 100%; + height: 100%; + } + } + } + + .merchantsSettled .list .item { + padding: 50rpx 0 20rpx; + + position: relative; + margin: 0 20px; + + &.no-border { + border-bottom: none; + padding-left: 0; + padding-right: 0; + } + + .item-title { + color: #666666; + font-size: 28rpx; + display: block; + } + + .item-desc { + color: #B2B2B2; + font-size: 22rpx; + display: block; + margin-top: 9rpx; + line-height: 36rpx; + } + } + + .acea-row, + .upload { + display: -webkit-box; + display: -moz-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-box-lines: multiple; + -moz-box-lines: multiple; + -o-box-lines: multiple; + -webkit-flex-wrap: wrap; + -ms-flex-wrap: wrap; + flex-wrap: wrap; + } + + .upload { + margin-top: 20rpx; + } + + .acea-row.row-middle { + -webkit-box-align: center; + -moz-box-align: center; + -o-box-align: center; + -ms-flex-align: center; + -webkit-align-items: center; + align-items: center; + padding-left: 2px; + } + + .acea-row.row-column { + -webkit-box-orient: vertical; + -moz-box-orient: vertical; + -o-box-orient: vertical; + -webkit-flex-direction: column; + -ms-flex-direction: column; + flex-direction: column; + } + + .acea-row.row-center-wrapper { + -webkit-box-align: center; + -moz-box-align: center; + -o-box-align: center; + -ms-flex-align: center; + -webkit-align-items: center; + align-items: center; + -webkit-box-pack: center; + -moz-box-pack: center; + -o-box-pack: center; + -ms-flex-pack: center; + -webkit-justify-content: center; + justify-content: center; + } + + .merchantsSettled .list .item .pictrue { + width: 130rpx; + height: 130rpx; + margin: 24rpx 22rpx 0 0; + position: relative; + font-size: 11px; + color: #bbb; + + &:nth-child(4n) { + margin-right: 0; + } + + &:nth-last-child(1) { + border: 0.5px solid #ddd; + box-sizing: border-box; + } + + uni-image, + image { + width: 100%; + height: 100%; + border-radius: 1px; + + img { + -webkit-touch-callout: none; + -webkit-user-select: none; + -moz-user-select: none; + display: block; + position: absolute; + top: 0; + left: 0; + opacity: 0; + width: 100%; + height: 100%; + } + } + + .icon-guanbi1 { + font-size: 33rpx; + position: absolute; + top: -10px; + right: -10px; + } + } + + .uni-list-cell-db { + position: relative; + } + + .merchantsSettled .submitBtn { + width: 588rpx; + margin: 0 auto; + height: 86rpx; + + border-radius: 25px; + text-align: center; + line-height: 86rpx; + font-size: 15px; + color: #fff; + background: #E3E3E3; + margin-top: 25px; + pointer-events: none; + } + + .merchantsSettled .submitBtn.on { + background: red; + pointer-events: all; + } + + + .settlementAgreement { + width: 100%; + height: 100%; + position: fixed; + top: 0; + left: 0; + background: rgba(0, 0, 0, .5); + z-index: 10; + } + + .settlementAgreement .setAgCount { + background: #fff; + width: 656rpx; + // height: 458px; + position: absolute; + top: 50%; + left: 50%; + + padding: 52rpx; + -webkit-transform: translate(-50%, -50%); + -moz-transform: translate(-50%, -50%); + transform: translate(-50%, -50%); + overflow: hidden; + + .content { + height: 900rpx; + overflow-y: scroll; + + /deep/ p { + font-size: 13px; + line-height: 22px; + } + + /deep/ img { + max-width: 100%; + } + } + } + + .settlementAgreement .setAgCount .icon { + font-size: 42rpx; + color: #b4b1b4; + position: absolute; + top: 15rpx; + right: 15rpx; + } + + .settlementAgreement .setAgCount .title { + color: #333; + font-size: 32rpx; + text-align: center; + font-weight: bold; + } + + + .settlementAgreement .setAgCount .contenta { + + color: #333; + font-size: 26rpx; + line-height: 22px; + text-align: justify; + text-justify: distribute-all-lines; + height: 68%; + + overflow-y: scroll; + + + } + + .setAgCountbtn { + display: flex; + justify-content: space-around; + padding-bottom:120rpx ; + + .setAgCountbtna { + margin-top: 40rpx; + width: 200rpx; + height: 74rpx; + text-align: center; + line-height: 74rpx; + border-radius: 46rpx 46rpx; + opacity: 1; + border: 2rpx solid #B3B3B3; + font-size: 25rpx; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 500; + color: #737373; + + } + + .setAgCountbtnb { + margin-top: 40rpx; + padding-left: 20rpx; + padding-right: 20rpx; + + text-align: center; + line-height: 74rpx; + background: #cecece; + border-radius: 46rpx 46rpx; + opacity: 1; + font-size: 25rpx; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 500; + color: #fff; + + } + + .setAgCountbtnc { + margin-top: 40rpx; + width: 200rpx; + height: 74rpx; + text-align: center; + line-height: 74rpx; + background: linear-gradient(270deg, #FF6D20 0%, #F84221 100%); + border-radius: 46rpx 46rpx; + opacity: 1; + font-size: 25rpx; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 500; + color: #fff; + + } + } + + + + + .left-content { + width: 680rpx; + height: 100%; + display: flex; + + background-color: #ffffff; + + .left-content-left { + width: 206rpx; + height: 100%; + background-color: #d9d9d9; + text-align: center; + padding-top: 20rpx; + + .content-top_txt { + font-size: 18rpx; + } + + .content-top_img { + + + width: 96rpx; + height: 96rpx; + border-radius: 50%; + margin: 0 auto; + margin-bottom: 40rpx; + + image { + border-radius: 50%; + width: 100%; + height: 100%; + } + + } + } + + .left-content-right { + padding-left: 30rpx; + position: relative; + padding-top: 20rpx; + + .content-right-one { + display: flex; + + .content-right-onea { + font-size: 30rpx; + } + + .content-right-oneb { + margin-top: 5rpx; + width: 40rpx; + height: 40rpx; + + image { + + width: 100%; + height: 100%; + } + } + } + + .content-right-botm { + position: absolute; + bottom: 200rpx; + width: 300rpx; + height: 70rpx; + line-height: 70rpx; + border-radius: 20rpx 20rpx; + left: 50%; + color: #ffffff; + background-color: #00a1f1; + text-align: center; + font-size: 25rpx; + } + } + } .conter-img { @@ -577,6 +1490,7 @@ width: 96rpx; height: 96rpx; border-radius: 50%; + image { border-radius: 50%; width: 100%; diff --git a/pages/margin/margin.vue b/pages/margin/margin.vue new file mode 100644 index 0000000..a9ab8a1 --- /dev/null +++ b/pages/margin/margin.vue @@ -0,0 +1,328 @@ + + + + + + \ No newline at end of file diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue index 5988551..3aad4a5 100644 --- a/pages/moreProject/moreProject.vue +++ b/pages/moreProject/moreProject.vue @@ -1,6 +1,16 @@