Главная Обзор Помощь
Регистрация Вход
zhh
/
front-end
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

开发

shish 4 лет назад
Родитель
b6b857465b
Сommit
17ddff839b
7 измененных файлов с 26 добавлено и 6 удалено
Разделённый вид Показать статистику Diff
  1. 0 0
      ghs/dist/shop/css/chunk-0b53063e.cb52c576.css
  2. 2 2
      ghs/dist/shop/index.html
  3. 0 0
      ghs/dist/shop/js/app.6a9722ef.js
  4. 0 0
      ghs/dist/shop/js/chunk-0b53063e.d3f622ad.js
  5. 0 0
      ghs/dist/shop/js/chunk-1dcae981.a90f32ee.js
  6. 3 3
      ghsApp/src/pagesClient/member/detail.vue
  7. 21 1
      hdApp/src/pagesPurchase/ghsProduct.vue

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/css/chunk-0b53063e.cb52c576.css


+ 2 - 2
ghs/dist/shop/index.html
Просмотреть файл 

@@ -1,4 +1,4 @@
 
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><title>销花宝</title><link href="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><title>销花宝</title><link href="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 
 			body,
 
 			#app {
 
 				height: 100%;
 
@@ -43,4 +43,4 @@
 
 			.once .sub-title {
 
 				color: #ababab;
 
 				font-size: 12px;
 
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.6251e874.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.wixhb.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.wixhb.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.wixhb.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.wixhb.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.wixhb.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.wixhb.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.wixhb.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.wixhb.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.wixhb.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.6251e874.js"></script></body></html>
 
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.6a9722ef.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.6a9722ef.js"></script></body></html>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/app.6a9722ef.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-0b53063e.d3f622ad.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-1dcae981.a90f32ee.js


+ 3 - 3
ghsApp/src/pagesClient/member/detail.vue
Просмотреть файл 

@@ -66,7 +66,7 @@
 
             </tui-list-cell>
 
 
             <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="changeLevel()">
 
-              <div class="tui-title">修改会员等级</div>
 
+              <div class="tui-title">修改等级</div>
 
             </tui-list-cell>
 
 
             <tui-list-cell class="line-cell" :hover="false">
 
@@ -131,7 +131,7 @@ export default {
 
     changeLevel(){
 
 
       let that = this
 
-      let levelList = ['普通客户', '青铜客户', '白银客户','黄金客户','钻石客户']
 
+      let levelList = ['普通', '青铜', '白银','黄金','钻石']
 
       uni.showActionSheet({
 
         itemList: levelList,
 
         success: function (respond) {
 
@@ -140,7 +140,7 @@ export default {
 
 
             uni.showModal({
 
 							title: "提示",
 
-							content: "确认修改为"+levelName+"客户？",
 
+							content: "确认修改客户等级为"+levelName+"？",
 
 							confirmText: "确认",
 
 							success: function (res) {
 
 								if (res.confirm) {

+ 21 - 1
hdApp/src/pagesPurchase/ghsProduct.vue
Просмотреть файл 

@@ -5,7 +5,7 @@
 
       <view class="header_inside">
 
         <image :src="pageInfo.avatar"></image>
 
         <view class="shop_info">
 
-          <view class="shop_title">{{pageInfo.name||''}}</view>
 
+          <view class="shop_title">{{pageInfo.name||''}}<text :class="[pageInfo.giveLevel==0?'level-common':'level']" >{{pageInfo.giveLevelName||''}}会员</text></view>
 
 
 			<view v-if="pageInfo.hasRechargeHb && pageInfo.hasRechargeHb ==1" class="shop_intro" @tap="recharge(pageInfo)">
 
 				<text>充值送红包<text style="color:red;font-weight:700;">{{parseFloat(pageInfo.hasRechargeHbAmount)}}</text>元
 
@@ -546,6 +546,26 @@ export default {
 
 		  overflow: hidden;
 
 		  white-space: nowrap;
 
 		  text-overflow: ellipsis;
 
+		  .level{
 
+            margin-left:30rpx;
 
+            color:white;
 
+            background:#3385FF;
 
+            border:1px solid #3385FF;
 
+            border-radius:50rpx;
 
+            font-size:22rpx;
 
+            padding:6rpx 10rpx;
 
+			position:absolute;
 
+		  }
 
+		  .level-common{
 
+            margin-left:30rpx;
 
+            color:white;
 
+            background:#CCCCCC;
 
+            border:1px solid #CCCCCC;
 
+            border-radius:50rpx;
 
+            font-size:20rpx;
 
+            padding:5rpx 10rpx;
 
+			position:absolute;
 
+		  }
 
         }
 
         &>.shop_intro{
 
           margin-top: 15upx;

Некоторые файлы не были показаны из-за большого количества измененных файлов