wangyan hai 3 semanas
pai
achega
bbb9f71f38
Modificáronse 42 ficheiros con 509 adicións e 229 borrados
  1. 1 1
      api/integral.js
  2. 1 1
      api/living.js
  3. 14 14
      components/es-integral-sign/es-integral-sign.vue
  4. 1 1
      components/signPop/signPop.vue
  5. 289 11
      package-lock.json
  6. 10 10
      pages.json
  7. 2 2
      pages/agent/components/rewardDoctor.vue
  8. 2 2
      pages/common/nav.vue
  9. 4 4
      pages/course/components/integralGoods.vue
  10. 1 1
      pages/course/components/studyCenter.vue
  11. 4 4
      pages/course/info1.vue
  12. 5 5
      pages/course/infoOld.vue
  13. 7 7
      pages/course/privilege.nvue
  14. 2 2
      pages/course/privilege1.nvue
  15. 31 31
      pages/course/video/living-app.nvue
  16. 4 4
      pages/courseAnswer/luckyBag.vue
  17. 1 1
      pages/courseAnswer/winningRecord.vue
  18. 1 1
      pages/index/share/share.vue
  19. 7 7
      pages/pointsMall/points.vue
  20. 3 3
      pages/store/packageOrderPay.vue
  21. 1 1
      pages/user/addEditAddress.vue
  22. 1 1
      pages/user/addEditPatient.vue
  23. 6 6
      pages/user/index.vue
  24. 2 2
      pages/user/integral/cart.vue
  25. 4 4
      pages/user/integral/integral.vue
  26. 2 2
      pages/user/integral/integralGoodsDetails.vue
  27. 8 8
      pages/user/integral/integralGoodsList.vue
  28. 1 1
      pages/user/integral/integralLogsList.vue
  29. 2 2
      pages/user/integral/integralOrderDetails.vue
  30. 2 2
      pages/user/integral/integralOrderList.vue
  31. 3 3
      pages/user/integral/integralOrderPay.vue
  32. 26 26
      pages/user/integral/points.vue
  33. 11 11
      pages/user/integralInfo.vue
  34. 5 5
      pages/user/integralMall.vue
  35. 2 2
      pages/user/wallet/commissionLogsList.vue
  36. 5 5
      pages/user/wallet/index.vue
  37. 1 1
      pages_live/components/giftPopup.vue
  38. 1 1
      pages_live/components/lotteryPopup.vue
  39. 8 8
      pages_live/living - 副本.vue
  40. 10 8
      pages_live/living.vue
  41. 8 8
      pages_live/livingQ.vue
  42. 10 10
      pages_live/shopping/integral.vue

+ 1 - 1
api/integral.js

@@ -30,7 +30,7 @@ export function doSign(data) {
 }
 }
 
 
 
 
-//添加芳华
+//添加
 export function addIntegral(type, extra, userId) { //类型 1浏览商品 2刷视频  
 export function addIntegral(type, extra, userId) { //类型 1浏览商品 2刷视频  
 
 
 	// 类型说明:1-浏览商品 2-刷视频 5-广告奖励
 	// 类型说明:1-浏览商品 2-刷视频 5-广告奖励

+ 1 - 1
api/living.js

@@ -181,7 +181,7 @@ export function liveInternetTraffic(data) {
 	return request('/appLive/app/live/liveTrafficLog/getLiveInternetTraffic', data, 'POST', 'application/json;charset=UTF-8');
 	return request('/appLive/app/live/liveTrafficLog/getLiveInternetTraffic', data, 'POST', 'application/json;charset=UTF-8');
 }
 }
 
 
-// 芳华
+// 
 export function getUserIntegralInfo(data) {
 export function getUserIntegralInfo(data) {
 	return request('/liveAPP/appLive/app/live/liveData/getUserIntegralInfo', data, 'GET', 'application/json;charset=UTF-8');
 	return request('/liveAPP/appLive/app/live/liveData/getUserIntegralInfo', data, 'GET', 'application/json;charset=UTF-8');
 }
 }

+ 14 - 14
components/es-integral-sign/es-integral-sign.vue

@@ -50,38 +50,38 @@
 				integralData: {
 				integralData: {
 					index: 2, //当前选中第几个,从1开始
 					index: 2, //当前选中第几个,从1开始
 					list: [{
 					list: [{
-							icon: 2, //1-显示芳华币  2-显示勾  3-显示红包
-							title: '+10芳华币',
+							icon: 2, //1-显示币  2-显示勾  3-显示红包
+							title: '+10币',
 							remark: '第一天',
 							remark: '第一天',
 						},
 						},
 						{
 						{
-							icon: 2, //1-显示芳华币  2-显示勾  3-显示红包
-							title: '+10芳华币',
+							icon: 2, //1-显示币  2-显示勾  3-显示红包
+							title: '+10币',
 							remark: '第二天',
 							remark: '第二天',
 						},
 						},
 						{
 						{
-							icon: 1, //1-显示芳华币  2-显示勾  3-显示红包
-							title: '+30芳华币',
+							icon: 1, //1-显示币  2-显示勾  3-显示红包
+							title: '+30币',
 							remark: '第三天',
 							remark: '第三天',
 						},
 						},
 						{
 						{
-							icon: 1, //1-显示芳华币  2-显示勾  3-显示红包
-							title: '+50芳华币',
+							icon: 1, //1-显示币  2-显示勾  3-显示红包
+							title: '+50币',
 							remark: '第四天',
 							remark: '第四天',
 						},
 						},
 						{
 						{
-							icon: 1, //1-显示芳华币  2-显示勾  3-显示红包
-							title: '+50芳华币',
+							icon: 1, //1-显示币  2-显示勾  3-显示红包
+							title: '+50币',
 							remark: '第五天',
 							remark: '第五天',
 						},
 						},
 						{
 						{
-							icon: 1, //1-显示芳华币  2-显示勾  3-显示红包
-							title: '+60芳华币',
+							icon: 1, //1-显示币  2-显示勾  3-显示红包
+							title: '+60币',
 							remark: '第六天',
 							remark: '第六天',
 						},
 						},
 						{
 						{
-							icon: 3, //1-显示芳华币  2-显示勾  3-显示红包
-							title: '芳华币礼包',
+							icon: 3, //1-显示币  2-显示勾  3-显示红包
+							title: '币礼包',
 							remark: '签到完成',
 							remark: '签到完成',
 						},
 						},
 
 

+ 1 - 1
components/signPop/signPop.vue

@@ -9,7 +9,7 @@
 					 <image class="signbox-topbg" src="@/static/images/ad/Frame.png" mode="widthFix"></image>
 					 <image class="signbox-topbg" src="@/static/images/ad/Frame.png" mode="widthFix"></image>
 					 <view class="signbox-headcon">
 					 <view class="signbox-headcon">
 						 <view>
 						 <view>
-							 <text>连续签到领</text><text style="color: #FFFC76;">芳华币</text>
+							 <text>连续签到领</text><text style="color: #FFFC76;">币</text>
 						 </view>
 						 </view>
 						 <view class="signbox-signnum">{{userSign.signNum==0?'您还没有签到':'已签到'+userSign.signNum+'天'}}</view>
 						 <view class="signbox-signnum">{{userSign.signNum==0?'您还没有签到':'已签到'+userSign.signNum+'天'}}</view>
 					 </view>
 					 </view>

+ 289 - 11
package-lock.json

@@ -110,11 +110,19 @@
             "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
             "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
             "dev": true
             "dev": true
         },
         },
+        "node_modules/@babel/helper-string-parser": {
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+            "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+            "peer": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
         "node_modules/@babel/helper-validator-identifier": {
         "node_modules/@babel/helper-validator-identifier": {
             "version": "7.28.5",
             "version": "7.28.5",
             "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
             "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
             "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
             "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
-            "dev": true,
             "engines": {
             "engines": {
                 "node": ">=6.9.0"
                 "node": ">=6.9.0"
             }
             }
@@ -128,6 +136,21 @@
                 "node": ">=6.9.0"
                 "node": ">=6.9.0"
             }
             }
         },
         },
+        "node_modules/@babel/parser": {
+            "version": "7.29.2",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.2.tgz",
+            "integrity": "sha512-4GgRzy/+fsBa72/RZVJmGKPmZu9Byn8o4MoLpmNe1m8ZfYnz5emHLQz3U4gLud6Zwl0RZIcgiLD7Uq7ySFuDLA==",
+            "peer": true,
+            "dependencies": {
+                "@babel/types": "^7.29.0"
+            },
+            "bin": {
+                "parser": "bin/babel-parser.js"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
         "node_modules/@babel/runtime": {
         "node_modules/@babel/runtime": {
             "version": "7.28.6",
             "version": "7.28.6",
             "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.6.tgz",
             "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.6.tgz",
@@ -136,6 +159,19 @@
                 "node": ">=6.9.0"
                 "node": ">=6.9.0"
             }
             }
         },
         },
+        "node_modules/@babel/types": {
+            "version": "7.29.0",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz",
+            "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==",
+            "peer": true,
+            "dependencies": {
+                "@babel/helper-string-parser": "^7.27.1",
+                "@babel/helper-validator-identifier": "^7.28.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
         "node_modules/@dcloudio/uni-cli-i18n": {
         "node_modules/@dcloudio/uni-cli-i18n": {
             "version": "2.0.2-4080720251210002",
             "version": "2.0.2-4080720251210002",
             "resolved": "https://registry.npmjs.org/@dcloudio/uni-cli-i18n/-/uni-cli-i18n-2.0.2-4080720251210002.tgz",
             "resolved": "https://registry.npmjs.org/@dcloudio/uni-cli-i18n/-/uni-cli-i18n-2.0.2-4080720251210002.tgz",
@@ -373,8 +409,7 @@
         "node_modules/@jridgewell/sourcemap-codec": {
         "node_modules/@jridgewell/sourcemap-codec": {
             "version": "1.5.5",
             "version": "1.5.5",
             "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
             "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
-            "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
-            "dev": true
+            "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og=="
         },
         },
         "node_modules/@jridgewell/trace-mapping": {
         "node_modules/@jridgewell/trace-mapping": {
             "version": "0.3.31",
             "version": "0.3.31",
@@ -1054,6 +1089,68 @@
             "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
             "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
             "dev": true
             "dev": true
         },
         },
+        "node_modules/@vue/compiler-core": {
+            "version": "3.5.31",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.31.tgz",
+            "integrity": "sha512-k/ueL14aNIEy5Onf0OVzR8kiqF/WThgLdFhxwa4e/KF/0qe38IwIdofoSWBTvvxQOesaz6riAFAUaYjoF9fLLQ==",
+            "peer": true,
+            "dependencies": {
+                "@babel/parser": "^7.29.2",
+                "@vue/shared": "3.5.31",
+                "entities": "^7.0.1",
+                "estree-walker": "^2.0.2",
+                "source-map-js": "^1.2.1"
+            }
+        },
+        "node_modules/@vue/compiler-core/node_modules/entities": {
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz",
+            "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==",
+            "peer": true,
+            "engines": {
+                "node": ">=0.12"
+            },
+            "funding": {
+                "url": "https://github.com/fb55/entities?sponsor=1"
+            }
+        },
+        "node_modules/@vue/compiler-dom": {
+            "version": "3.5.31",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.31.tgz",
+            "integrity": "sha512-BMY/ozS/xxjYqRFL+tKdRpATJYDTTgWSo0+AJvJNg4ig+Hgb0dOsHPXvloHQ5hmlivUqw1Yt2pPIqp4e0v1GUw==",
+            "peer": true,
+            "dependencies": {
+                "@vue/compiler-core": "3.5.31",
+                "@vue/shared": "3.5.31"
+            }
+        },
+        "node_modules/@vue/compiler-sfc": {
+            "version": "3.5.31",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.31.tgz",
+            "integrity": "sha512-M8wpPgR9UJ8MiRGjppvx9uWJfLV7A/T+/rL8s/y3QG3u0c2/YZgff3d6SuimKRIhcYnWg5fTfDMlz2E6seUW8Q==",
+            "peer": true,
+            "dependencies": {
+                "@babel/parser": "^7.29.2",
+                "@vue/compiler-core": "3.5.31",
+                "@vue/compiler-dom": "3.5.31",
+                "@vue/compiler-ssr": "3.5.31",
+                "@vue/shared": "3.5.31",
+                "estree-walker": "^2.0.2",
+                "magic-string": "^0.30.21",
+                "postcss": "^8.5.8",
+                "source-map-js": "^1.2.1"
+            }
+        },
+        "node_modules/@vue/compiler-ssr": {
+            "version": "3.5.31",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.31.tgz",
+            "integrity": "sha512-h0xIMxrt/LHOvJKMri+vdYT92BrK3HFLtDqq9Pr/lVVfE4IyKZKvWf0vJFW10Yr6nX02OR4MkJwI0c1HDa1hog==",
+            "peer": true,
+            "dependencies": {
+                "@vue/compiler-dom": "3.5.31",
+                "@vue/shared": "3.5.31"
+            }
+        },
         "node_modules/@vue/component-compiler-utils": {
         "node_modules/@vue/component-compiler-utils": {
             "version": "3.3.0",
             "version": "3.3.0",
             "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz",
             "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz",
@@ -1126,6 +1223,56 @@
             "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.4.tgz",
             "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.4.tgz",
             "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g=="
             "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g=="
         },
         },
+        "node_modules/@vue/reactivity": {
+            "version": "3.5.31",
+            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.31.tgz",
+            "integrity": "sha512-DtKXxk9E/KuVvt8VxWu+6Luc9I9ETNcqR1T1oW1gf02nXaZ1kuAx58oVu7uX9XxJR0iJCro6fqBLw9oSBELo5g==",
+            "peer": true,
+            "dependencies": {
+                "@vue/shared": "3.5.31"
+            }
+        },
+        "node_modules/@vue/runtime-core": {
+            "version": "3.5.31",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.31.tgz",
+            "integrity": "sha512-AZPmIHXEAyhpkmN7aWlqjSfYynmkWlluDNPHMCZKFHH+lLtxP/30UJmoVhXmbDoP1Ng0jG0fyY2zCj1PnSSA6Q==",
+            "peer": true,
+            "dependencies": {
+                "@vue/reactivity": "3.5.31",
+                "@vue/shared": "3.5.31"
+            }
+        },
+        "node_modules/@vue/runtime-dom": {
+            "version": "3.5.31",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.31.tgz",
+            "integrity": "sha512-xQJsNRmGPeDCJq/u813tyonNgWBFjzfVkBwDREdEWndBnGdHLHgkwNBQxLtg4zDrzKTEcnikUy1UUNecb3lJ6g==",
+            "peer": true,
+            "dependencies": {
+                "@vue/reactivity": "3.5.31",
+                "@vue/runtime-core": "3.5.31",
+                "@vue/shared": "3.5.31",
+                "csstype": "^3.2.3"
+            }
+        },
+        "node_modules/@vue/server-renderer": {
+            "version": "3.5.31",
+            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.31.tgz",
+            "integrity": "sha512-GJuwRvMcdZX/CriUnyIIOGkx3rMV3H6sOu0JhdKbduaeCji6zb60iOGMY7tFoN24NfsUYoFBhshZtGxGpxO4iA==",
+            "peer": true,
+            "dependencies": {
+                "@vue/compiler-ssr": "3.5.31",
+                "@vue/shared": "3.5.31"
+            },
+            "peerDependencies": {
+                "vue": "3.5.31"
+            }
+        },
+        "node_modules/@vue/shared": {
+            "version": "3.5.31",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.31.tgz",
+            "integrity": "sha512-nBxuiuS9Lj5bPkPbWogPUnjxxWpkRniX7e5UBQDWl6Fsf4roq9wwV+cR7ezQ4zXswNvPIlsdj1slcLB7XCsRAw==",
+            "peer": true
+        },
         "node_modules/@vue/web-component-wrapper": {
         "node_modules/@vue/web-component-wrapper": {
             "version": "1.3.0",
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",
             "resolved": "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",
@@ -2341,6 +2488,51 @@
             "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==",
             "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==",
             "dev": true
             "dev": true
         },
         },
+        "node_modules/copy-webpack-plugin": {
+            "version": "14.0.0",
+            "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-14.0.0.tgz",
+            "integrity": "sha512-3JLW90aBGeaTLpM7mYQKpnVdgsUZRExY55giiZgLuX/xTQRUs1dOCwbBnWnvY6Q6rfZoXMNwzOQJCSZPppfqXA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "glob-parent": "^6.0.1",
+                "normalize-path": "^3.0.0",
+                "schema-utils": "^4.2.0",
+                "serialize-javascript": "^7.0.3",
+                "tinyglobby": "^0.2.12"
+            },
+            "engines": {
+                "node": ">= 20.9.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^5.1.0"
+            }
+        },
+        "node_modules/copy-webpack-plugin/node_modules/serialize-javascript": {
+            "version": "7.0.5",
+            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-7.0.5.tgz",
+            "integrity": "sha512-F4LcB0UqUl1zErq+1nYEEzSHJnIwb3AF2XWB94b+afhrekOUijwooAYqFyRbjYkm2PAKBabx6oYv/xDxNi8IBw==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=20.0.0"
+            }
+        },
+        "node_modules/core-js": {
+            "version": "3.49.0",
+            "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.49.0.tgz",
+            "integrity": "sha512-es1U2+YTtzpwkxVLwAFdSpaIMyQaq0PBgm3YD1W3Qpsn1NAmO3KSgZfu+oGSWVu6NvLHoHCV/aYcsE5wiB7ALg==",
+            "hasInstallScript": true,
+            "peer": true,
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/core-js"
+            }
+        },
         "node_modules/core-util-is": {
         "node_modules/core-util-is": {
             "version": "1.0.3",
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
             "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
@@ -2672,6 +2864,12 @@
                 "node": ">=8.0.0"
                 "node": ">=8.0.0"
             }
             }
         },
         },
+        "node_modules/csstype": {
+            "version": "3.2.3",
+            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
+            "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
+            "peer": true
+        },
         "node_modules/d": {
         "node_modules/d": {
             "version": "1.0.2",
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/d/-/d-1.0.2.tgz",
             "resolved": "https://registry.npmjs.org/d/-/d-1.0.2.tgz",
@@ -3536,6 +3734,12 @@
                 "node": ">=4.0"
                 "node": ">=4.0"
             }
             }
         },
         },
+        "node_modules/estree-walker": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+            "peer": true
+        },
         "node_modules/esutils": {
         "node_modules/esutils": {
             "version": "2.0.3",
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
             "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
@@ -5352,6 +5556,15 @@
                 "yallist": "^2.1.2"
                 "yallist": "^2.1.2"
             }
             }
         },
         },
+        "node_modules/magic-string": {
+            "version": "0.30.21",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
+            "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
+            "peer": true,
+            "dependencies": {
+                "@jridgewell/sourcemap-codec": "^1.5.5"
+            }
+        },
         "node_modules/make-plural": {
         "node_modules/make-plural": {
             "version": "7.5.0",
             "version": "7.5.0",
             "resolved": "https://registry.npmjs.org/make-plural/-/make-plural-7.5.0.tgz",
             "resolved": "https://registry.npmjs.org/make-plural/-/make-plural-7.5.0.tgz",
@@ -5687,7 +5900,6 @@
             "version": "3.3.11",
             "version": "3.3.11",
             "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
             "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
             "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
             "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
-            "dev": true,
             "funding": [
             "funding": [
                 {
                 {
                     "type": "github",
                     "type": "github",
@@ -6381,8 +6593,7 @@
         "node_modules/picocolors": {
         "node_modules/picocolors": {
             "version": "1.1.1",
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
             "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-            "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-            "dev": true
+            "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
         },
         },
         "node_modules/picomatch": {
         "node_modules/picomatch": {
             "version": "2.3.1",
             "version": "2.3.1",
@@ -6419,10 +6630,9 @@
             }
             }
         },
         },
         "node_modules/postcss": {
         "node_modules/postcss": {
-            "version": "8.5.6",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
-            "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
-            "dev": true,
+            "version": "8.5.8",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.8.tgz",
+            "integrity": "sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==",
             "funding": [
             "funding": [
                 {
                 {
                     "type": "opencollective",
                     "type": "opencollective",
@@ -8297,7 +8507,6 @@
             "version": "1.2.1",
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
             "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
             "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
             "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-            "dev": true,
             "engines": {
             "engines": {
                 "node": ">=0.10.0"
                 "node": ">=0.10.0"
             }
             }
@@ -8758,6 +8967,54 @@
             "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
             "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
             "dev": true
             "dev": true
         },
         },
+        "node_modules/tinyglobby": {
+            "version": "0.2.15",
+            "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
+            "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "fdir": "^6.5.0",
+                "picomatch": "^4.0.3"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/SuperchupuDev"
+            }
+        },
+        "node_modules/tinyglobby/node_modules/fdir": {
+            "version": "6.5.0",
+            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+            "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=12.0.0"
+            },
+            "peerDependencies": {
+                "picomatch": "^3 || ^4"
+            },
+            "peerDependenciesMeta": {
+                "picomatch": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/tinyglobby/node_modules/picomatch": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+            "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
+        },
         "node_modules/tmp": {
         "node_modules/tmp": {
             "version": "0.2.5",
             "version": "0.2.5",
             "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz",
             "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz",
@@ -8996,6 +9253,27 @@
                 "node": ">= 0.8"
                 "node": ">= 0.8"
             }
             }
         },
         },
+        "node_modules/vue": {
+            "version": "3.5.31",
+            "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.31.tgz",
+            "integrity": "sha512-iV/sU9SzOlmA/0tygSmjkEN6Jbs3nPoIPFhCMLD2STrjgOU8DX7ZtzMhg4ahVwf5Rp9KoFzcXeB1ZrVbLBp5/Q==",
+            "peer": true,
+            "dependencies": {
+                "@vue/compiler-dom": "3.5.31",
+                "@vue/compiler-sfc": "3.5.31",
+                "@vue/runtime-dom": "3.5.31",
+                "@vue/server-renderer": "3.5.31",
+                "@vue/shared": "3.5.31"
+            },
+            "peerDependencies": {
+                "typescript": "*"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
+            }
+        },
         "node_modules/vue-hot-reload-api": {
         "node_modules/vue-hot-reload-api": {
             "version": "2.3.4",
             "version": "2.3.4",
             "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
             "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",

+ 10 - 10
pages.json

@@ -1499,7 +1499,7 @@
 		{
 		{
 			"path": "pages/user/integral/integral",
 			"path": "pages/user/integral/integral",
 			"style": {
 			"style": {
-				"navigationBarTitleText": "我的芳华币",
+				"navigationBarTitleText": "我的币",
 				"enablePullDownRefresh": false,
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 				"navigationBarTextStyle": "black"
@@ -1508,7 +1508,7 @@
 		{
 		{
 			"path": "pages/user/integral/points",
 			"path": "pages/user/integral/points",
 			"style": {
 			"style": {
-				"navigationBarTitleText": "我的芳华币",
+				"navigationBarTitleText": "我的币",
 				"enablePullDownRefresh": false,
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black",
 				"navigationBarTextStyle": "black",
@@ -1520,7 +1520,7 @@
 		{
 		{
 			"path": "pages/user/integral/integralGoodsList",
 			"path": "pages/user/integral/integralGoodsList",
 			"style": {
 			"style": {
-				"navigationBarTitleText": "芳华币商城",
+				"navigationBarTitleText": "币商城",
 				"navigationStyle": "custom",
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": false,
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarBackgroundColor": "#ffffff",
@@ -1539,7 +1539,7 @@
 		{
 		{
 			"path": "pages/user/integral/integralOrderPay",
 			"path": "pages/user/integral/integralOrderPay",
 			"style": {
 			"style": {
-				"navigationBarTitleText": "芳华币兑换",
+				"navigationBarTitleText": "币兑换",
 				"enablePullDownRefresh": false,
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 				"navigationBarTextStyle": "black"
@@ -1548,7 +1548,7 @@
 		{
 		{
 			"path": "pages/user/integral/integralOrderCartPay",
 			"path": "pages/user/integral/integralOrderCartPay",
 			"style": {
 			"style": {
-				"navigationBarTitleText": "芳华币兑换",
+				"navigationBarTitleText": "币兑换",
 				"enablePullDownRefresh": false,
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 				"navigationBarTextStyle": "black"
@@ -1584,7 +1584,7 @@
 		{
 		{
 			"path": "pages/user/integral/integralLogsList",
 			"path": "pages/user/integral/integralLogsList",
 			"style": {
 			"style": {
-				"navigationBarTitleText": "芳华币记录",
+				"navigationBarTitleText": "币记录",
 				"enablePullDownRefresh": false,
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 				"navigationBarTextStyle": "black"
@@ -1631,7 +1631,7 @@
 		{
 		{
 			"path": "pages/user/integralMall",
 			"path": "pages/user/integralMall",
 			"style": {
 			"style": {
-				"navigationBarTitleText": "芳华币商城",
+				"navigationBarTitleText": "币商城",
 				"navigationStyle": "custom",
 				"navigationStyle": "custom",
 				"titleNView": false,
 				"titleNView": false,
 				"enablePullDownRefresh": false,
 				"enablePullDownRefresh": false,
@@ -1753,7 +1753,7 @@
 		{
 		{
 			"path": "pages/user/integralInfo",
 			"path": "pages/user/integralInfo",
 			"style": {
 			"style": {
-				"navigationBarTitleText": "我的芳华币",
+				"navigationBarTitleText": "我的币",
 				"navigationStyle": "custom",
 				"navigationStyle": "custom",
 				"titleNView": false,
 				"titleNView": false,
 				"enablePullDownRefresh": false,
 				"enablePullDownRefresh": false,
@@ -2641,7 +2641,7 @@
 		{
 		{
 			"path" : "pages_live/shopping/integral",
 			"path" : "pages_live/shopping/integral",
 			"style": {
 			"style": {
-					  "navigationBarTitleText": "芳华币",
+					  "navigationBarTitleText": "币",
 					  "enablePullDownRefresh": false,
 					  "enablePullDownRefresh": false,
 					  				"navigationBarBackgroundColor": "#ffffff",
 					  				"navigationBarBackgroundColor": "#ffffff",
 
 
@@ -2901,7 +2901,7 @@
 				{
 				{
 					"path": "shopping/integral",
 					"path": "shopping/integral",
 					"style": {
 					"style": {
-						"navigationBarTitleText": "芳华币",
+						"navigationBarTitleText": "币",
 						"enablePullDownRefresh": false,
 						"enablePullDownRefresh": false,
 						"navigationBarTextStyle": "black",
 						"navigationBarTextStyle": "black",
 						"navigationBarBackgroundColor": "#ffffff"
 						"navigationBarBackgroundColor": "#ffffff"

+ 2 - 2
pages/agent/components/rewardDoctor.vue

@@ -10,7 +10,7 @@
 				</view>
 				</view>
 				<view class="">
 				<view class="">
 					<view class="es-c-22 es-fs-34 es-fw-600">
 					<view class="es-c-22 es-fs-34 es-fw-600">
-						芳华币打赏
+						币打赏
 					</view>
 					</view>
 					<view class="es-c-99 es-fs-26">
 					<view class="es-c-99 es-fs-26">
 						可抵现金
 						可抵现金
@@ -34,7 +34,7 @@
 					</view>
 					</view>
 				</view>
 				</view>
 				<view class="es-mt-6 es-c-99 es-fs-24">
 				<view class="es-mt-6 es-c-99 es-fs-24">
-					芳华币余额
+					币余额
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>

+ 2 - 2
pages/common/nav.vue

@@ -70,7 +70,7 @@
 						url: '/pages/user/test/order',
 						url: '/pages/user/test/order',
 					},
 					},
 					{
 					{
-						name: ' 6.4我的-芳华币商城 ',
+						name: ' 6.4我的-币商城 ',
 						url: '/pages/user/integralMall',
 						url: '/pages/user/integralMall',
 					},
 					},
 					{
 					{
@@ -110,7 +110,7 @@
 						url: '/pages/user/share',
 						url: '/pages/user/share',
 					},
 					},
 					{
 					{
-						name: '7.17芳华币页面 ',
+						name: '7.17币页面 ',
 						url: '/pages/user/integralInfo',
 						url: '/pages/user/integralInfo',
 					},
 					},
 					{
 					{

+ 4 - 4
pages/course/components/integralGoods.vue

@@ -4,7 +4,7 @@
 			<view class="my-integral">
 			<view class="my-integral">
 				<view class="left">
 				<view class="left">
 					<view class="x-ac">
 					<view class="x-ac">
-						<view class="label">我的芳华币</view>
+						<view class="label">我的币</view>
 						<view class="x-ac" style="margin-left: 20rpx;" @click="goCart()">
 						<view class="x-ac" style="margin-left: 20rpx;" @click="goCart()">
 							<u-icon name="shopping-cart" color="#fff" size="28"></u-icon>
 							<u-icon name="shopping-cart" color="#fff" size="28"></u-icon>
 							<view class="label">购物车</view>
 							<view class="label">购物车</view>
@@ -13,12 +13,12 @@
 					</view>
 					</view>
 					<view style="display: flex;align-items: baseline;">
 					<view style="display: flex;align-items: baseline;">
 						<view class="integral">{{integral}}</view>
 						<view class="integral">{{integral}}</view>
-						<view class="integralbtn" @click="goIntegral">获取芳华币</view>
+						<view class="integralbtn" @click="goIntegral">获取币</view>
 					</view>
 					</view>
 				</view>
 				</view>
 				<view class="btn-box">
 				<view class="btn-box">
 					<view class="btn" @click="navTo('/pages/user/integral/integralLogsList')">获得记录</view>
 					<view class="btn" @click="navTo('/pages/user/integral/integralLogsList')">获得记录</view>
-					<view class="btn" @click="navTo('/pages/user/integral/integralOrderList')">芳华币订单</view>
+					<view class="btn" @click="navTo('/pages/user/integral/integralOrderList')">币订单</view>
 				</view>
 				</view>
 			</view>
 			</view>
 			<!-- 搜索 -->
 			<!-- 搜索 -->
@@ -46,7 +46,7 @@
 						{{item.goodsName}}
 						{{item.goodsName}}
 					</view>
 					</view>
 					<view class="price-box">
 					<view class="price-box">
-						<view class="price">{{item.integral}}芳华币</view>
+						<view class="price">{{item.integral}}币</view>
 						<view class="count">价值:{{item.otPrice.toFixed(2)}}元</view>
 						<view class="count">价值:{{item.otPrice.toFixed(2)}}元</view>
 					</view>
 					</view>
 				</view>
 				</view>

+ 1 - 1
pages/course/components/studyCenter.vue

@@ -60,7 +60,7 @@
 		<view class="sign">
 		<view class="sign">
 			<view class="sign-info">
 			<view class="sign-info">
 				<view class="sign-day">已连续签到<text>{{signNum}}</text>天</view>
 				<view class="sign-day">已连续签到<text>{{signNum}}</text>天</view>
-				<view class="sign-num">我的芳华币:{{integral}}</view>
+				<view class="sign-num">我的币:{{integral}}</view>
 			</view>
 			</view>
 			
 			
 			<view class="sign-box">
 			<view class="sign-box">

+ 4 - 4
pages/course/info1.vue

@@ -361,7 +361,7 @@
 				isShowPayType:false,
 				isShowPayType:false,
 				payTypes:["微信支付","支付宝支付"],
 				payTypes:["微信支付","支付宝支付"],
 				payType:1,//微信支付1  支付宝支付2
 				payType:1,//微信支付1  支付宝支付2
-				createType:3,//1直接购买,2芳华币兑换 3开通会员
+				createType:3,//1直接购买,2币兑换 3开通会员
 				orderId:null,
 				orderId:null,
 				order:null,
 				order:null,
 				showPayTips:false,
 				showPayTips:false,
@@ -438,7 +438,7 @@
 						}
 						}
 						this.vipMethods=["开通会员"];
 						this.vipMethods=["开通会员"];
 						if(this.data.isIntegral==1){
 						if(this.data.isIntegral==1){
-							this.vipMethods.push("芳华币兑换")
+							this.vipMethods.push("币兑换")
 						}
 						}
 						if(this.data.sellPrice>0){
 						if(this.data.sellPrice>0){
 							this.vipMethods.push(this.data.sellPrice+"元购买");
 							this.vipMethods.push(this.data.sellPrice+"元购买");
@@ -956,7 +956,7 @@
 					this.isShowPayType=true;
 					this.isShowPayType=true;
 					this.createType=1;
 					this.createType=1;
 				}
 				}
-				if(vipMethod.indexOf('芳华币兑换')!=-1){  //芳华币兑换
+				if(vipMethod.indexOf('福币兑换')!=-1){  //福币兑换
 					this.createType=2;
 					this.createType=2;
 				}
 				}
 				if(vipMethod.indexOf('开通会员')!=-1){  //开通会员
 				if(vipMethod.indexOf('开通会员')!=-1){  //开通会员
@@ -970,7 +970,7 @@
 				if(this.createType==1){  //直接购买
 				if(this.createType==1){  //直接购买
 					 this.createCourseOrder();
 					 this.createCourseOrder();
 				}
 				}
-				else if(this.createType==2){   //芳华币兑换
+				else if(this.createType==2){   //币兑换
 					 this.createIntegralOrder();
 					 this.createIntegralOrder();
 				}
 				}
 				else{  //开通会员
 				else{  //开通会员

+ 5 - 5
pages/course/infoOld.vue

@@ -421,7 +421,7 @@
 				isShowPayType:false,
 				isShowPayType:false,
 				payTypes:["微信支付","支付宝支付"],
 				payTypes:["微信支付","支付宝支付"],
 				payType:1,//微信支付1  支付宝支付2
 				payType:1,//微信支付1  支付宝支付2
-				createType:3,//1直接购买,2芳华币兑换 3开通会员
+				createType:3,//1直接购买,2币兑换 3开通会员
 				orderId:null,
 				orderId:null,
 				order:null,
 				order:null,
 				showPayTips:false,
 				showPayTips:false,
@@ -626,7 +626,7 @@
 						}
 						}
 						this.vipMethods=["开通会员"];
 						this.vipMethods=["开通会员"];
 						if(this.data.isIntegral==1){
 						if(this.data.isIntegral==1){
-							this.vipMethods.push("芳华币兑换")
+							this.vipMethods.push("币兑换")
 						}
 						}
 						if(this.data.sellPrice>0){
 						if(this.data.sellPrice>0){
 							this.vipMethods.push(this.data.sellPrice+"元购买");
 							this.vipMethods.push(this.data.sellPrice+"元购买");
@@ -813,7 +813,7 @@
 				}
 				}
 				//切换之前添加课程目录学习记录
 				//切换之前添加课程目录学习记录
 				this.addStudyCourse();
 				this.addStudyCourse();
-				this.addIntegral();	//加芳华
+				this.addIntegral();	//加
 				this.pickCatalogMethod(index,type);
 				this.pickCatalogMethod(index,type);
 				this.scrollIntoViewId = 'cataLogue' + index;
 				this.scrollIntoViewId = 'cataLogue' + index;
 			},
 			},
@@ -1299,7 +1299,7 @@
 					this.isShowPayType=true;
 					this.isShowPayType=true;
 					this.createType=1;
 					this.createType=1;
 				}
 				}
-				if(vipMethod.indexOf('芳华币兑换')!=-1){  //芳华币兑换
+				if(vipMethod.indexOf('福币兑换')!=-1){  //福币兑换
 					this.createType=2;
 					this.createType=2;
 				}
 				}
 				if(vipMethod.indexOf('开通会员')!=-1){  //开通会员
 				if(vipMethod.indexOf('开通会员')!=-1){  //开通会员
@@ -1313,7 +1313,7 @@
 				if(this.createType==1){  //直接购买
 				if(this.createType==1){  //直接购买
 					 this.createCourseOrder();
 					 this.createCourseOrder();
 				}
 				}
-				else if(this.createType==2){   //芳华币兑换
+				else if(this.createType==2){   //币兑换
 					 this.createIntegralOrder();
 					 this.createIntegralOrder();
 				}
 				}
 				else{  //开通会员
 				else{  //开通会员

+ 7 - 7
pages/course/privilege.nvue

@@ -5,7 +5,7 @@
 			<view class="es es-fx es-pc es-h-56 es-ml-30 es-mr-30 es-mt-10">
 			<view class="es es-fx es-pc es-h-56 es-ml-30 es-mr-30 es-mt-10">
 				<image class="es-w-74 es-h-40" style="position: absolute;left:55px;top:20rpx" src="/static/image/course/xiangyun.png"></image>
 				<image class="es-w-74 es-h-40" style="position: absolute;left:55px;top:20rpx" src="/static/image/course/xiangyun.png"></image>
 				<text class="es-fs-32 es-h-56 es-fw-500 prititle">
 				<text class="es-fs-32 es-h-56 es-fw-500 prititle">
-					{{(!isIos || (isIos&&showIOSPay==1)) ? '开通VIP专享以下特权':'芳华币兑换享以下特权'}}</text>
+					{{(!isIos || (isIos&&showIOSPay==1)) ? '开通VIP专享以下特权':'币兑换享以下特权'}}</text>
 				<image class="es-w-74 es-h-40" style="position: absolute;right:55px;top:20rpx" src="/static/image/course/xiangyun2.png"></image>
 				<image class="es-w-74 es-h-40" style="position: absolute;right:55px;top:20rpx" src="/static/image/course/xiangyun2.png"></image>
 			    <image  class="es-w-40 es-h-40" style="position: absolute;right:0;top:0" @tap="closePopup" src="/static/images/close40.png"></image>
 			    <image  class="es-w-40 es-h-40" style="position: absolute;right:0;top:0" @tap="closePopup" src="/static/images/close40.png"></image>
 			</view>
 			</view>
@@ -108,12 +108,12 @@
 		data() {
 		data() {
 			return {
 			return {
 				vipSelIndex:0,
 				vipSelIndex:0,
-				vipMethods:["开通会员","芳华币兑换","0.01元购买"],
+				vipMethods:["开通会员","币兑换","0.01元购买"],
 				vipMethodIdx:1,
 				vipMethodIdx:1,
 				isShowPayType:false,
 				isShowPayType:false,
 				payTypes:["微信支付","微信支付备用","支付宝支付"],
 				payTypes:["微信支付","微信支付备用","支付宝支付"],
 				payType:1,//微信支付1  微信支付备用2  支付宝支付3
 				payType:1,//微信支付1  微信支付备用2  支付宝支付3
-				createType:2,//1直接购买,2芳华币兑换 3开通会员
+				createType:2,//1直接购买,2币兑换 3开通会员
 				courseId:null,
 				courseId:null,
 				videoId:null,
 				videoId:null,
 				orderId:null,
 				orderId:null,
@@ -122,7 +122,7 @@
 				sellPrice:0,
 				sellPrice:0,
 				privilegeBoxHei:0,
 				privilegeBoxHei:0,
 				catalogIndex:-1,
 				catalogIndex:-1,
-				integral: 0, // 芳华
+				integral: 0, // 
 				isIos: false,
 				isIos: false,
 				showIOSPay: 0,
 				showIOSPay: 0,
 				isCanPay: true,
 				isCanPay: true,
@@ -142,7 +142,7 @@
 				that.courseId=data.courseId;
 				that.courseId=data.courseId;
 				that.sellPrice=data.sellPrice;
 				that.sellPrice=data.sellPrice;
 				that.catalogIndex=data.catalogIndex;
 				that.catalogIndex=data.catalogIndex;
-				that.vipMethods=["开通会员", data.integral + "芳华币兑换", data.sellPrice+"元购买"];
+				that.vipMethods=["开通会员", data.integral + "币兑换", data.sellPrice+"元购买"];
 				this.isIos = (plus.os.name == "iOS")
 				this.isIos = (plus.os.name == "iOS")
 				// if(this.isIos) {
 				// if(this.isIos) {
 				// 	this.getIOSPayStatusFun()
 				// 	this.getIOSPayStatusFun()
@@ -185,7 +185,7 @@
 					this.createType=1;
 					this.createType=1;
 					//this.changeFrame(true);
 					//this.changeFrame(true);
 				}
 				}
-				if(vipMethod.indexOf('芳华币兑换')!=-1){  //芳华币兑换
+				if(vipMethod.indexOf('福币兑换')!=-1){  //福币兑换
 					this.createType=2;
 					this.createType=2;
 					//this.changeFrame(false);
 					//this.changeFrame(false);
 				}
 				}
@@ -207,7 +207,7 @@
 				if(this.createType==1){  //直接购买
 				if(this.createType==1){  //直接购买
 					 this.createCourseOrder();
 					 this.createCourseOrder();
 				}
 				}
-				else if(this.createType==2){   //芳华币兑换
+				else if(this.createType==2){   //币兑换
 					 this.createIntegralOrder();
 					 this.createIntegralOrder();
 				}
 				}
 				else{  //开通会员
 				else{  //开通会员

+ 2 - 2
pages/course/privilege1.nvue

@@ -94,12 +94,12 @@
 		data() {
 		data() {
 			return {
 			return {
 				vipSelIndex:0,
 				vipSelIndex:0,
-				vipMethods:["开通会员","芳华币兑换","0.01元购买"],
+				vipMethods:["开通会员","币兑换","0.01元购买"],
 				vipMethodIdx:0,
 				vipMethodIdx:0,
 				isShowPayType:false,
 				isShowPayType:false,
 				payTypes:["微信支付","支付宝支付"],
 				payTypes:["微信支付","支付宝支付"],
 				payType:1,//微信支付1  支付宝支付2
 				payType:1,//微信支付1  支付宝支付2
-				createType:3,//1直接购买,2芳华币兑换 3开通会员
+				createType:3,//1直接购买,2币兑换 3开通会员
 				orderId:null,
 				orderId:null,
 				order:null,
 				order:null,
 			}
 			}

+ 31 - 31
pages/course/video/living-app.nvue

@@ -175,7 +175,7 @@
 				   <view class="reward-popup-content">
 				   <view class="reward-popup-content">
 						<image src="/static/images/ad/integral_img.png" class="popup-gift-icon"></image>
 						<image src="/static/images/ad/integral_img.png" class="popup-gift-icon"></image>
 						<text class="popup-title">放弃太可惜啦!</text>
 						<text class="popup-title">放弃太可惜啦!</text>
-						<text class="popup-desc">继续浏览广告,可获得芳华币</text>
+						<text class="popup-desc">继续浏览广告,可获得币</text>
 						<view class="popup-confirm-btn">
 						<view class="popup-confirm-btn">
 							<text class="popup-confirm-title" @click="continueAd">继续观看</text>
 							<text class="popup-confirm-title" @click="continueAd">继续观看</text>
 						</view>
 						</view>
@@ -249,49 +249,49 @@
 						next: '',
 						next: '',
 					}]
 					}]
 				},
 				},
-				dataList: [], //用于数据循环的列表🌟💗
-				wHeight: 0, //获取的屏幕高度🌟💗
-				boxStyle: { //视频父视图样式🌟💗
+				dataList: [], //用于数据循环的列表
+				wHeight: 0, //获取的屏幕高度
+				boxStyle: { //视频父视图样式
 					'height': 0,
 					'height': 0,
 					'width': 0,
 					'width': 0,
 				},
 				},
-				videoStyle: { //视频,图片封面样式🌟💗
+				videoStyle: { //视频,图片封面样式
 					'height': 0,
 					'height': 0,
 					'width': 0,
 					'width': 0,
 					'marginTop':0
 					'marginTop':0
 				},
 				},
 				Heights: 0,
 				Heights: 0,
-				k: 0, //默认为0🌟💗
-				playIngIds: [], //正在播放的视频id列队,列队用于处理滑动过快导致的跳频问题🌟💗
+				k: 0, //默认为0
+				playIngIds: [], //正在播放的视频id列队,列队用于处理滑动过快导致的跳频问题
 				ready: false, //可忽略
 				ready: false, //可忽略
-				isDragging: false, //false代表停止滑动🌟💗
-				refreshing: false, //用于下拉刷新🌟💗
-				windowWidth: 0, //获取屏幕宽度🌟💗
+				isDragging: false, //false代表停止滑动
+				refreshing: false, //用于下拉刷新
+				windowWidth: 0, //获取屏幕宽度
 				windowHeight: 0,
 				windowHeight: 0,
 				dex: [0, 0], //用于判断是上滑还是下滑,第一个存旧值,第二个存新值【目前在1.0.7已经废弃】
 				dex: [0, 0], //用于判断是上滑还是下滑,第一个存旧值,第二个存新值【目前在1.0.7已经废弃】
-				currents: 0, //用于左右滑动,0代表视频界面,1代表右滑界面🌟💗
-				platform: '', //用于获取操作系统:ios、android🌟💗
-				playIng: false, //用于视频初始化时是否播放,默认不播放🌟💗
-				videoTime: '', //视频总时长,这个主要用来截取时间数值💗
-				videoTimes: '', //视频时长,用这个来获取时间值,例如:00:30这个时间值💗
-				changeTime: '', //显示滑动进度条时变化的时间💗
+				currents: 0, //用于左右滑动,0代表视频界面,1代表右滑界面
+				platform: '', //用于获取操作系统:ios、android
+				playIng: false, //用于视频初始化时是否播放,默认不播放
+				videoTime: '', //视频总时长,这个主要用来截取时间数值
+				videoTimes: '', //视频时长,用这个来获取时间值,例如:00:30这个时间值
+				changeTime: '', //显示滑动进度条时变化的时间
 				isShowimage: false, //是否显示封面【1.0.4已废弃,但是意思需要记住】
 				isShowimage: false, //是否显示封面【1.0.4已废弃,但是意思需要记住】
-				currenttimes: 0, //当前时间💗
+				currenttimes: 0, //当前时间
 				isShowProgressBarTime: false, //是否拖动进度条,如果拖动(true)则显示进度条时间,否则不显示(false)【1.0.4已废弃,但是意思需要记住】
 				isShowProgressBarTime: false, //是否拖动进度条,如果拖动(true)则显示进度条时间,否则不显示(false)【1.0.4已废弃,但是意思需要记住】
-				ProgressBarOpacity: 0.7, //进度条不拖动时的默认值,就是透明的💗
-				dotWidth: 0, //播放的小圆点,默认没有💗
-				deleteHeight: 0, //测试高度🌟💗
+				ProgressBarOpacity: 0.7, //进度条不拖动时的默认值,就是透明的
+				dotWidth: 0, //播放的小圆点,默认没有
+				deleteHeight: 0, //测试高度
 				statusBarHeight:0,
 				statusBarHeight:0,
-				percent: 0, //百分小数💗
-				currentPosition: 0, //滑块当前位置💗//2.0已弃用,现已用于后端参数
-				currentPositions: 0, //滑块当前位置的副本💗//2.0已弃用,现已用于后端参数
-				newTime: 0, //跟手滑动后的最新时间💗
-				timeNumber: 0, //🌟💗
-				ProgressBarBottom: 20, //进度条离底部的距离💗
-				object_fit: 'contain', //视频样式默认包含🌟💗   contain :包含  fill:填充 cover:覆盖
-				mode: 'aspectFit', //图片封面样式🌟💗
-				timeout: "", //🌟用来阻止 setTimeout()方法
-				voice: "", //🌟用来阻止 setTimeout()方法
+				percent: 0, //百分小数
+				currentPosition: 0, //滑块当前位置//2.0已弃用,现已用于后端参数
+				currentPositions: 0, //滑块当前位置的副本//2.0已弃用,现已用于后端参数
+				newTime: 0, //跟手滑动后的最新时间
+				timeNumber: 0, //
+				ProgressBarBottom: 20, //进度条离底部的距离
+				object_fit: 'contain', //视频样式默认包含   contain :包含  fill:填充 cover:覆盖
+				mode: 'aspectFit', //图片封面样式
+				timeout: "", //用来阻止 setTimeout()方法
+				voice: "", //用来阻止 setTimeout()方法
 				oldVideo: "",
 				oldVideo: "",
 				isAutoplay: false, //是否开启自动播放(默认不开启)
 				isAutoplay: false, //是否开启自动播放(默认不开启)
 				autoplayText: "开启自动播放",
 				autoplayText: "开启自动播放",
@@ -592,7 +592,7 @@
 			          // 广告正常播放结束,且满足奖励条件
 			          // 广告正常播放结束,且满足奖励条件
 					 if (detail && detail.isEnded) {
 					 if (detail && detail.isEnded) {
 					     this.showRewardPopup = false;
 					     this.showRewardPopup = false;
-					     // 发放芳华币奖励(调用接口)
+					     // 发放币奖励(调用接口)
 					     this.giveAdReward()
 					     this.giveAdReward()
 						 
 						 
 						 // 广告关闭后,继续播放原视频
 						 // 广告关闭后,继续播放原视频

+ 4 - 4
pages/courseAnswer/luckyBag.vue

@@ -18,7 +18,7 @@
 					您已经领取过本次福袋啦~
 					您已经领取过本次福袋啦~
 				</view>
 				</view>
 				<view class="activity_title4">
 				<view class="activity_title4">
-					赶紧前往芳华币商城,兑换好物吧
+					赶紧前往币商城,兑换好物吧
 				</view>
 				</view>
 			</template>
 			</template>
 			<view class="ybg_box">
 			<view class="ybg_box">
@@ -49,10 +49,10 @@
 					mode="heightFix"></image>
 					mode="heightFix"></image>
 				<text class="popup-tit">恭喜您获得</text>
 				<text class="popup-tit">恭喜您获得</text>
 				<view class="con">
 				<view class="con">
-					<view class="numbox color_FB2205"><text class="num">+{{coinAmount||0}}</text>芳华币</view>
-					<view>您的芳华币总额:<text class="color_FB2205" style="font-weight: 600;">{{balance||0}}</text></view>
+					<view class="numbox color_FB2205"><text class="num">+{{coinAmount||0}}</text>币</view>
+					<view>您的币总额:<text class="color_FB2205" style="font-weight: 600;">{{balance||0}}</text></view>
 				</view>
 				</view>
-				<view class="popup-tips">赶紧去芳华币商城,兑换好物吧~</view>
+				<view class="popup-tips">赶紧去币商城,兑换好物吧~</view>
 				<view class="popbtn x-c" @click="navToIntegral">前往兑换</view>
 				<view class="popbtn x-c" @click="navToIntegral">前往兑换</view>
 				<view class="back_icon" style="padding:10px;display:  flex;align-items: center;justify-content: center;" @click="navback">
 				<view class="back_icon" style="padding:10px;display:  flex;align-items: center;justify-content: center;" @click="navback">
 					<image src="/static/back_icon.png"></image>
 					<image src="/static/back_icon.png"></image>

+ 1 - 1
pages/courseAnswer/winningRecord.vue

@@ -8,7 +8,7 @@
 				<view class="time">{{ item.createTime }}</view>
 				<view class="time">{{ item.createTime }}</view>
 			</view>
 			</view>
 
 
-			<!-- 纯芳华币不显示按钮 -->
+			<!-- 纯币不显示按钮 -->
 			<view v-if="item.goodsId" class="u-btn x-ac" @click="goDetail(item)">
 			<view v-if="item.goodsId" class="u-btn x-ac" @click="goDetail(item)">
 				详情
 				详情
 			</view>
 			</view>

+ 1 - 1
pages/index/share/share.vue

@@ -18,7 +18,7 @@
 		
 		
 		<view class="es es-pe es-p-r">
 		<view class="es es-pe es-p-r">
 			<view class="es es-c es-fw-n es-fs-30 es-h-60 es-br es es-ac es-pc" style="background-color: #FFE8DC;margin-right: 60rpx;width:378rpx">
 			<view class="es es-c es-fw-n es-fs-30 es-h-60 es-br es es-ac es-pc" style="background-color: #FFE8DC;margin-right: 60rpx;width:378rpx">
-				海量芳华币等你拿
+				海量币等你拿
 			</view>
 			</view>
 			<view class="es-icon es-w-43 es-h-47 es-icon-user-share-notice"></view>
 			<view class="es-icon es-w-43 es-h-47 es-icon-user-share-notice"></view>
 		</view>
 		</view>

+ 7 - 7
pages/pointsMall/points.vue

@@ -7,7 +7,7 @@
 					<!-- <view class="my-integral">
 					<!-- <view class="my-integral">
 						<view class="left">
 						<view class="left">
 							<view class="x-ac">
 							<view class="x-ac">
-								<view class="label">我的芳华币</view>
+								<view class="label">我的币</view>
 								<view class="x-ac" style="margin-left: 20rpx;" @click="goCart()">
 								<view class="x-ac" style="margin-left: 20rpx;" @click="goCart()">
 									<u-icon name="shopping-cart" color="#fff" size="28"></u-icon>
 									<u-icon name="shopping-cart" color="#fff" size="28"></u-icon>
 									<view class="label">购物车</view>
 									<view class="label">购物车</view>
@@ -16,12 +16,12 @@
 							</view>
 							</view>
 							<view style="display: flex;align-items: baseline;">
 							<view style="display: flex;align-items: baseline;">
 								<view class="integral">{{integral}}</view>
 								<view class="integral">{{integral}}</view>
-								<view class="integralbtn" @click="goIntegral">获取芳华币</view>
+								<view class="integralbtn" @click="goIntegral">获取币</view>
 							</view>
 							</view>
 						</view>
 						</view>
 						<view class="btn-box">
 						<view class="btn-box">
 							<view class="btn" @click="navTo('/pages/user/integral/integralLogsList')">获得记录</view>
 							<view class="btn" @click="navTo('/pages/user/integral/integralLogsList')">获得记录</view>
-							<view class="btn" @click="navTo('/pages/user/integral/integralOrderList')">芳华币订单</view>
+							<view class="btn" @click="navTo('/pages/user/integral/integralOrderList')">币订单</view>
 						</view>
 						</view>
 					</view> -->
 					</view> -->
 					<view class="inner-box">
 					<view class="inner-box">
@@ -29,11 +29,11 @@
 							<view class="left">
 							<view class="left">
 								<view class="align-center">
 								<view class="align-center">
 									<!-- <image class="w32 h32" src="../../static/images/user/jifen_icon.png" mode=""></image> -->
 									<!-- <image class="w32 h32" src="../../static/images/user/jifen_icon.png" mode=""></image> -->
-									<text>我的芳华币</text>
+									<text>我的币</text>
 								</view>
 								</view>
 								<view class="num">{{integral}}</view>
 								<view class="num">{{integral}}</view>
 							</view>
 							</view>
-							<view class="guize" @click="goIntegral">获取芳华币</view>
+							<view class="guize" @click="goIntegral">获取币</view>
 						</view>
 						</view>
 					    <view class="bottom-box">
 					    <view class="bottom-box">
 							<view class="ttbg"></view>
 							<view class="ttbg"></view>
@@ -44,7 +44,7 @@
 								</view>
 								</view>
 								<view class="t-right" @click="navTo('/pages/user/integral/integralOrderList')">
 								<view class="t-right" @click="navTo('/pages/user/integral/integralOrderList')">
 									<image  src="@/static/images/integral/exchange_records_icon.png" mode=""></image>
 									<image  src="@/static/images/integral/exchange_records_icon.png" mode=""></image>
-									<view>芳华币订单</view>
+									<view>币订单</view>
 								</view>
 								</view>
 							</view>
 							</view>
 							
 							
@@ -89,7 +89,7 @@
 							{{item.goodsName}}
 							{{item.goodsName}}
 						</view>
 						</view>
 						<view class="price-box">
 						<view class="price-box">
-							<view class="price">{{item.integral}}芳华币</view>
+							<view class="price">{{item.integral}}币</view>
 							<view class="count">价值:{{item.otPrice.toFixed(2)}}元</view>
 							<view class="count">价值:{{item.otPrice.toFixed(2)}}元</view>
 						</view>
 						</view>
 					</view>
 					</view>

+ 3 - 3
pages/store/packageOrderPay.vue

@@ -94,7 +94,7 @@
 							<text class="text">全款支付</text>
 							<text class="text">全款支付</text>
 						</view>
 						</view>
 						<label>
 						<label>
-							<text v-show="payType==1" class="text" style="margin-right: 14rpx;">赠送芳华币:{{integral}}</text>
+							<text v-show="payType==1" class="text" style="margin-right: 14rpx;">赠送币:{{integral}}</text>
 							<radio :value="1"  :checked="payType=='1'" />
 							<radio :value="1"  :checked="payType=='1'" />
 						</label>
 						</label>
 					</view>
 					</view>
@@ -104,7 +104,7 @@
 							<text class="text">物流代收</text>
 							<text class="text">物流代收</text>
 						</view>
 						</view>
 						<label>
 						<label>
-							<text v-show="payType==2" class="text" style="margin-right: 14rpx;">赠送芳华币:{{integral}}</text>
+							<text v-show="payType==2" class="text" style="margin-right: 14rpx;">赠送币:{{integral}}</text>
 							<radio  :value="2" :checked="payType=='2'" />
 							<radio  :value="2" :checked="payType=='2'" />
 						</label>
 						</label>
 					</view>
 					</view>
@@ -114,7 +114,7 @@
 							<text class="text">货到付款</text>
 							<text class="text">货到付款</text>
 						</view>
 						</view>
 						<label>
 						<label>
-							<text v-show="payType==3" class="text" style="margin-right: 14rpx;">赠送芳华币:{{integral}}</text>
+							<text v-show="payType==3" class="text" style="margin-right: 14rpx;">赠送币:{{integral}}</text>
 							<radio  :value="3" :checked="payType=='3'" />
 							<radio  :value="3" :checked="payType=='3'" />
 						</label>
 						</label>
 					</view>
 					</view>

+ 1 - 1
pages/user/addEditAddress.vue

@@ -182,7 +182,7 @@
 							 	icon:'none',
 							 	icon:'none',
 							 	title: res.alert|| res.msg,
 							 	title: res.alert|| res.msg,
 							 });
 							 });
-							 const time = res.alert&&res.alert.includes('芳华币') ? 1500 : 500
+							 const time = res.alert&&res.alert.includes('币') ? 1500 : 500
 							 setTimeout(function() {
 							 setTimeout(function() {
 								 uni.$emit('refreshAddress');
 								 uni.$emit('refreshAddress');
 								 uni.navigateBack({
 								 uni.navigateBack({

+ 1 - 1
pages/user/addEditPatient.vue

@@ -612,7 +612,7 @@ import {getPatientById,addPatient,editPatient} from '@/api/patient'
 							 	icon:'none',
 							 	icon:'none',
 							 	title: res.alert|| res.msg,
 							 	title: res.alert|| res.msg,
 							 });
 							 });
-							 const time = res.alert&&res.alert.includes('芳华币') ? 1500 : 500
+							 const time = res.alert&&res.alert.includes('币') ? 1500 : 500
 							 setTimeout(function() {
 							 setTimeout(function() {
 								 uni.$emit('refreshPatient');
 								 uni.$emit('refreshPatient');
 								 uni.navigateBack({
 								 uni.navigateBack({

+ 6 - 6
pages/user/index.vue

@@ -48,11 +48,11 @@
 		    		</view>
 		    		</view>
 		    	</view>
 		    	</view>
 				
 				
-		    	<!-- 芳华币,币,券信息 -->
+		    	<!-- 币,币,券信息 -->
 		    	<view class="mybox-integral"  v-if="!this.userIsDel()">
 		    	<view class="mybox-integral"  v-if="!this.userIsDel()">
 		    		<view class="mybox-integral-item" @click="loginNavTo('/pages/user/integral/points')">
 		    		<view class="mybox-integral-item" @click="loginNavTo('/pages/user/integral/points')">
 		    			<view class="num">{{ this.userIsDel()?0:user.integral}}</view>
 		    			<view class="num">{{ this.userIsDel()?0:user.integral}}</view>
-		    			<view>芳华币</view>
+		    			<view>币</view>
 		    		</view>
 		    		</view>
 					<view class="mybox-integral-item"  @click="loginNavTo('/pages/user/wallet/index')">
 					<view class="mybox-integral-item"  @click="loginNavTo('/pages/user/wallet/index')">
 						<view class="num">{{ this.userIsDel()?0:user.mayWithdraw}}</view>
 						<view class="num">{{ this.userIsDel()?0:user.mayWithdraw}}</view>
@@ -202,9 +202,9 @@
 					that.logout();
 					that.logout();
 				} 
 				} 
 			});
 			});
-			if(!this.$qconfig.isAppStore){  //应用市场版本隐藏芳华币商城
+			if(!this.$qconfig.isAppStore){  //应用市场版本隐藏币商城
 				let integralMenus=(this.menuList[2]).menus;
 				let integralMenus=(this.menuList[2]).menus;
-				let integralSubMenu={name: '芳华币商城',icon: "../../static/image/my/my_points_icon.png",pageUrl:"/pages/user/integral/integralGoodsList"};
+				let integralSubMenu={name: '币商城',icon: "../../static/image/my/my_points_icon.png",pageUrl:"/pages/user/integral/integralGoodsList"};
 				integralMenus.splice(2, 0, integralSubMenu);
 				integralMenus.splice(2, 0, integralSubMenu);
 			}
 			}
 			// #ifdef APP-PLUS
 			// #ifdef APP-PLUS
@@ -266,7 +266,7 @@
 										pageUrl:"/pages/store/storeOrderRefundList",
 										pageUrl:"/pages/store/storeOrderRefundList",
 										isShow:true
 										isShow:true
 									},{
 									},{
-										name: '芳华币订单',
+										name: '币订单',
 										icon: "../../static/image/my/my_cforder_icon.png",
 										icon: "../../static/image/my/my_cforder_icon.png",
 										pageUrl:"/pages/user/integral/integralOrderList",
 										pageUrl:"/pages/user/integral/integralOrderList",
 										isShow:true
 										isShow:true
@@ -369,7 +369,7 @@
 									isShow:true
 									isShow:true
 								}
 								}
 								// ,{
 								// ,{
-								// 	name: '芳华币商城',
+								// 	name: '币商城',
 								// 	icon: "../../static/image/my/my_points_icon.png",
 								// 	icon: "../../static/image/my/my_points_icon.png",
 								// 	pageUrl:"/pages/user/integral/integralGoodsList"
 								// 	pageUrl:"/pages/user/integral/integralGoodsList"
 								// }
 								// }

+ 2 - 2
pages/user/integral/cart.vue

@@ -20,7 +20,7 @@
 					<view class="price-num">
 					<view class="price-num">
 						<view class="price">
 						<view class="price">
 								<text class="text">{{item.goodsIntegral}}</text>
 								<text class="text">{{item.goodsIntegral}}</text>
-								<text class="unit">芳华币</text>
+								<text class="unit">币</text>
 							<!-- <text class="unit">+</text> -->
 							<!-- <text class="unit">+</text> -->
 							<text class="oldprice">¥{{item.otPrice.toFixed(2)}}</text>
 							<text class="oldprice">¥{{item.otPrice.toFixed(2)}}</text>
 						</view>
 						</view>
@@ -63,7 +63,7 @@
 						</view>
 						</view>
 					</view> -->
 					</view> -->
 					<view class="total">
 					<view class="total">
-						<text class="label">所需芳华币</text>
+						<text class="label">所需币</text>
 						<view class="price">
 						<view class="price">
 							<text class="num">{{totalIntegral}}</text>
 							<text class="num">{{totalIntegral}}</text>
 						</view>
 						</view>

+ 4 - 4
pages/user/integral/integral.vue

@@ -9,7 +9,7 @@
 					<view class="status_bar" :style="{height: statusBarHeight}"></view>
 					<view class="status_bar" :style="{height: statusBarHeight}"></view>
 					<view class="back-box" @click="back">
 					<view class="back-box" @click="back">
 						<!-- <image src="../static/images/back_white.png" mode=""></image> -->
 						<!-- <image src="../static/images/back_white.png" mode=""></image> -->
-						<text class="title">我的芳华币</text>
+						<text class="title">我的币</text>
 						<text></text>
 						<text></text>
 					</view>
 					</view>
 				</view>
 				</view>
@@ -17,9 +17,9 @@
 				<view style="padding-bottom: 88upx;">
 				<view style="padding-bottom: 88upx;">
 					<view :style="{height: statusBarHeight}"></view>
 					<view :style="{height: statusBarHeight}"></view>
 				</view>
 				</view>
-				<!-- 可用芳华币 -->
+				<!-- 可用币 -->
 				<view class="available-points">
 				<view class="available-points">
-					<text class="label">可用芳华币</text>
+					<text class="label">可用币</text>
 					<text class="num">{{integral}}</text>
 					<text class="num">{{integral}}</text>
 				</view>
 				</view>
 				<!-- 签到 -->
 				<!-- 签到 -->
@@ -55,7 +55,7 @@
 					</view>
 					</view>
 				</view>
 				</view>
 				<view class="content">
 				<view class="content">
-					<!-- 芳华币列表 -->
+					<!-- 币列表 -->
 					<view class="points-cont">
 					<view class="points-cont">
 						<!-- tab切换 -->
 						<!-- tab切换 -->
 						<view class="pub-tab-box">
 						<view class="pub-tab-box">

+ 2 - 2
pages/user/integral/integralGoodsDetails.vue

@@ -29,7 +29,7 @@
 			<view class="integral-box">
 			<view class="integral-box">
 				<view class="title">{{item.goodsName}}</view>
 				<view class="title">{{item.goodsName}}</view>
 				<view class="num-box">
 				<view class="num-box">
-					<view class="price"  >{{item.integral}} 芳华币</view>
+					<view class="price"  >{{item.integral}} 币</view>
 					<view class="count">原价:{{item.otPrice.toFixed(2)}}元</view>
 					<view class="count">原价:{{item.otPrice.toFixed(2)}}元</view>
 				</view>
 				</view>
 				 
 				 
@@ -42,7 +42,7 @@
 		</view>
 		</view>
 		<view class="btn-foot">
 		<view class="btn-foot">
 			<view class="p-price-box">
 			<view class="p-price-box">
-				<view class="p-name">兑换芳华币</view>
+				<view class="p-name">兑换币</view>
 				<view class="p-price"  >{{item.integral}}</view>
 				<view class="p-price"  >{{item.integral}}</view>
 			</view>
 			</view>
 			<view class="btn-box">
 			<view class="btn-box">

+ 8 - 8
pages/user/integral/integralGoodsList.vue

@@ -6,13 +6,13 @@
 				<view class="top-box" :style="{paddingTop: paddingTop+'px'}">
 				<view class="top-box" :style="{paddingTop: paddingTop+'px'}">
 					<view class="x-bc" style="padding-bottom: 20rpx;" @click="navBack()">
 					<view class="x-bc" style="padding-bottom: 20rpx;" @click="navBack()">
 						<u-icon name="arrow-left" color="#fff" size="24"></u-icon>
 						<u-icon name="arrow-left" color="#fff" size="24"></u-icon>
-						<view style="color: #fff;font-size: 36rpx;">芳华币商城</view>
+						<view style="color: #fff;font-size: 36rpx;">币商城</view>
 						<view style="width: 24px;"></view>
 						<view style="width: 24px;"></view>
 					</view>
 					</view>
 					<!-- <view class="my-integral">
 					<!-- <view class="my-integral">
 						<view class="left">
 						<view class="left">
 							<view class="x-ac">
 							<view class="x-ac">
-								<view class="label">我的芳华币</view>
+								<view class="label">我的币</view>
 								<view class="x-ac" style="margin-left: 20rpx;" @click="goCart()">
 								<view class="x-ac" style="margin-left: 20rpx;" @click="goCart()">
 									<u-icon name="shopping-cart" color="#fff" size="28"></u-icon>
 									<u-icon name="shopping-cart" color="#fff" size="28"></u-icon>
 									<view class="label">购物车</view>
 									<view class="label">购物车</view>
@@ -21,12 +21,12 @@
 							</view>
 							</view>
 							<view style="display: flex;align-items: baseline;">
 							<view style="display: flex;align-items: baseline;">
 								<view class="integral">{{integral}}</view>
 								<view class="integral">{{integral}}</view>
-								<view class="integralbtn" @click="goIntegral">获取芳华币</view>
+								<view class="integralbtn" @click="goIntegral">获取币</view>
 							</view>
 							</view>
 						</view>
 						</view>
 						<view class="btn-box">
 						<view class="btn-box">
 							<view class="btn" @click="navTo('/pages/user/integral/integralLogsList')">获得记录</view>
 							<view class="btn" @click="navTo('/pages/user/integral/integralLogsList')">获得记录</view>
-							<view class="btn" @click="navTo('/pages/user/integral/integralOrderList')">芳华币订单</view>
+							<view class="btn" @click="navTo('/pages/user/integral/integralOrderList')">币订单</view>
 						</view>
 						</view>
 					</view> -->
 					</view> -->
 					<view class="inner-box">
 					<view class="inner-box">
@@ -34,11 +34,11 @@
 							<view class="left">
 							<view class="left">
 								<view class="align-center">
 								<view class="align-center">
 									<!-- <image class="w32 h32" src="../../static/images/user/jifen_icon.png" mode=""></image> -->
 									<!-- <image class="w32 h32" src="../../static/images/user/jifen_icon.png" mode=""></image> -->
-									<text>我的芳华币</text>
+									<text>我的币</text>
 								</view>
 								</view>
 								<view class="num">{{integral}}</view>
 								<view class="num">{{integral}}</view>
 							</view>
 							</view>
-							<view class="guize" @click="goIntegral">获取芳华币</view>
+							<view class="guize" @click="goIntegral">获取币</view>
 						</view>
 						</view>
 					    <view class="bottom-box">
 					    <view class="bottom-box">
 							<view class="ttbg"></view>
 							<view class="ttbg"></view>
@@ -49,7 +49,7 @@
 								</view>
 								</view>
 								<view class="t-right" @click="navTo('/pages/user/integral/integralOrderList')">
 								<view class="t-right" @click="navTo('/pages/user/integral/integralOrderList')">
 									<image  src="@/static/images/integral/exchange_records_icon.png" mode=""></image>
 									<image  src="@/static/images/integral/exchange_records_icon.png" mode=""></image>
-									<view>芳华币订单</view>
+									<view>币订单</view>
 								</view>
 								</view>
 							</view>
 							</view>
 							
 							
@@ -92,7 +92,7 @@
 							{{item.goodsName}}
 							{{item.goodsName}}
 						</view>
 						</view>
 						<view class="price-box">
 						<view class="price-box">
-							<view class="price">{{item.integral}}芳华币</view>
+							<view class="price">{{item.integral}}币</view>
 							<view class="count">价值:{{item.otPrice.toFixed(2)}}元</view>
 							<view class="count">价值:{{item.otPrice.toFixed(2)}}元</view>
 						</view>
 						</view>
 					</view>
 					</view>

+ 1 - 1
pages/user/integral/integralLogsList.vue

@@ -11,7 +11,7 @@
 				</view>
 				</view>
 				<view class="right">
 				<view class="right">
 					<text  :class="item.integral>0?'money green':'money red'">{{item.integral}}</text>
 					<text  :class="item.integral>0?'money green':'money red'">{{item.integral}}</text>
-					<text class="remark">剩余芳华币:{{item.balance}}</text>
+					<text class="remark">剩余币:{{item.balance}}</text>
 				</view>
 				</view>
 			</view>
 			</view>
 			</mescroll-body>
 			</mescroll-body>

+ 2 - 2
pages/user/integral/integralOrderDetails.vue

@@ -76,7 +76,7 @@
 								</view>
 								</view>
 								<view class="price-num">
 								<view class="price-num">
 									<view class="price">
 									<view class="price">
-										<text class="unit">芳华币:</text>
+										<text class="unit">币:</text>
 										<text class="num"  >{{item.integral}}</text>
 										<text class="num"  >{{item.integral}}</text>
 									</view>
 									</view>
 									<view class="num" >x{{getItemQuantity(order, item, index)}}</view>
 									<view class="num" >x{{getItemQuantity(order, item, index)}}</view>
@@ -101,7 +101,7 @@
 						</view>
 						</view>
 					 
 					 
 						<view   class="item">
 						<view   class="item">
-							<text class="label">使用芳华币</text>
+							<text class="label">使用币</text>
 							<text class="text"  >¥{{order.integral}}</text>
 							<text class="text"  >¥{{order.integral}}</text>
 						</view>
 						</view>
 						<view   class="item" v-if="order.deliveryName!=null">
 						<view   class="item" v-if="order.deliveryName!=null">

+ 2 - 2
pages/user/integral/integralOrderList.vue

@@ -42,7 +42,7 @@
 								</view>
 								</view>
 								<view class="num-box">
 								<view class="num-box">
 									<view class="price">
 									<view class="price">
-										<text class="unit">芳华币</text>
+										<text class="unit">币</text>
 										<text class="num" >{{subItem.integral}}</text>
 										<text class="num" >{{subItem.integral}}</text>
 									</view>
 									</view>
 									<view class="amount"  >x{{getItemQuantity(item, subItem, subIndex)}}</view>
 									<view class="amount"  >x{{getItemQuantity(item, subItem, subIndex)}}</view>
@@ -52,7 +52,7 @@
 						<!-- 实付金额、按钮 -->
 						<!-- 实付金额、按钮 -->
 						<view class="bottom-box">
 						<view class="bottom-box">
 							<view class="amount-paid">
 							<view class="amount-paid">
-								<text class="label">使用芳华币:</text>
+								<text class="label">使用币:</text>
 								<view class="price-box">
 								<view class="price-box">
 									<view class="unit">¥</view>
 									<view class="unit">¥</view>
 									<view class="num" >{{item.integral}}</view>
 									<view class="num" >{{item.integral}}</view>

+ 3 - 3
pages/user/integral/integralOrderPay.vue

@@ -41,7 +41,7 @@
 						</view>
 						</view>
 						<view class="price-num">
 						<view class="price-num">
 							<view class="price">
 							<view class="price">
-								<text class="unit">芳华币</text>
+								<text class="unit">币</text>
 								<text class="num">{{item.integral}}</text>
 								<text class="num">{{item.integral}}</text>
 							</view>
 							</view>
 							<view class="num"  >x1</view>
 							<view class="num"  >x1</view>
@@ -52,7 +52,7 @@
 			<view class="other-info">
 			<view class="other-info">
 				<view class="item">
 				<view class="item">
 					<view class="left">
 					<view class="left">
-						<text class="label">所需芳华币:</text>
+						<text class="label">所需币:</text>
 					</view>
 					</view>
 					<view class="right">
 					<view class="right">
 						<text class="text">{{item.integral}}</text>
 						<text class="text">{{item.integral}}</text>
@@ -62,7 +62,7 @@
 			<view class="other-info">
 			<view class="other-info">
 				<view class="item">
 				<view class="item">
 					<view class="left">
 					<view class="left">
-						<text class="label">我的芳华币:</text>
+						<text class="label">我的币:</text>
 					</view>
 					</view>
 					<view class="right">
 					<view class="right">
 						<text class="text">{{integral}}</text>
 						<text class="text">{{integral}}</text>

+ 26 - 26
pages/user/integral/points.vue

@@ -6,7 +6,7 @@
 				<view class="uni-nav-back" @click="$navBack()">
 				<view class="uni-nav-back" @click="$navBack()">
 					<image src="@/static/images/back_white_icon.png" mode="aspectFill"></image>
 					<image src="@/static/images/back_white_icon.png" mode="aspectFill"></image>
 				</view>
 				</view>
-				<view class="uni-nav-title" style="flex: 1;text-align: center;">我的芳华币</view>
+				<view class="uni-nav-title" style="flex: 1;text-align: center;">我的币</view>
 			</view>
 			</view>
 			<image class="uni-nav-bar_bg" src="@/static/images/integral/integral_top_bg.png" mode="widthFix"></image>
 			<image class="uni-nav-bar_bg" src="@/static/images/integral/integral_top_bg.png" mode="widthFix"></image>
 		</view>
 		</view>
@@ -16,13 +16,13 @@
 		<view class="container-body">
 		<view class="container-body">
 			<view class="pointsbox">
 			<view class="pointsbox">
 				<view class="pointsbox-left">
 				<view class="pointsbox-left">
-					<view>我的芳华币</view>
+					<view>我的币</view>
 					<view class="pointsbox-num">
 					<view class="pointsbox-num">
 						<text>{{integral}}</text>
 						<text>{{integral}}</text>
 						<text class="pointsbox-detail" @click="handleDetail">明细</text>
 						<text class="pointsbox-detail" @click="handleDetail">明细</text>
 					</view>
 					</view>
 					<!-- <view class="pointsbox-desc">可抵现金{{money}}元,最高可100%抵扣</view> -->
 					<!-- <view class="pointsbox-desc">可抵现金{{money}}元,最高可100%抵扣</view> -->
-					<view class="pointsbox-desc">其中{{withdrawIntegral}}芳华币可兑换现金提现
+					<view class="pointsbox-desc">其中{{withdrawIntegral}}币可兑换现金提现
 					    <text v-if="withdrawIntegral!==0 && !$isIos()" class="" @click="openBox">【去兑换】</text>
 					    <text v-if="withdrawIntegral!==0 && !$isIos()" class="" @click="openBox">【去兑换】</text>
 					</view>
 					</view>
 					
 					
@@ -33,7 +33,7 @@
 				<!-- 签到 -->
 				<!-- 签到 -->
 				<view class="signbox box">
 				<view class="signbox box">
 					<view class="signbox-head">
 					<view class="signbox-head">
-						<text class="box-title">连续签到领芳华币</text>
+						<text class="box-title">连续签到领币</text>
 						<view class="signbox-head-r">已签到<text>{{signNum}}</text>天</view>
 						<view class="signbox-head-r">已签到<text>{{signNum}}</text>天</view>
 					</view>
 					</view>
 					
 					
@@ -92,11 +92,11 @@
 										<text class="title-tip" v-if="item.title =='邀请好友享福利'">最高一万元</text>
 										<text class="title-tip" v-if="item.title =='邀请好友享福利'">最高一万元</text>
 									</view>
 									</view>
 									<view v-show="item.id==0||item.id==2||item.id==7" v-html="item.desc"></view>
 									<view v-show="item.id==0||item.id==2||item.id==7" v-html="item.desc"></view>
-									<view v-show="item.id==1">每日首次成功发布视频<text style="color: #FF5C03;">+{{integralInfo.integralTalentVideo||0}}</text>芳华币</view>
-									<view v-show="item.id==3">每集<text style="color: #FF5C03;">+{{integralInfo.integralCourse||0}}</text>芳华币</view>
-									<view v-show="item.id==4">实际消费满1元<text style="color: #FF5C03;">+{{integralInfo.integralRatio||0}}</text>芳华币</view>
-									<view v-show="item.id==5">填写即送<text style="color: #FF5C03;">+{{integralInfo.integralFollow||0}}芳华币/条</text></view>
-									<view v-show="item.id==6">分享至微信、朋友圈<text style="color: #FF5C03;">+{{integralInfo.integralShare||0}}芳华币/条</text></view>
+									<view v-show="item.id==1">每日首次成功发布视频<text style="color: #FF5C03;">+{{integralInfo.integralTalentVideo||0}}</text>币</view>
+									<view v-show="item.id==3">每集<text style="color: #FF5C03;">+{{integralInfo.integralCourse||0}}</text>币</view>
+									<view v-show="item.id==4">实际消费满1元<text style="color: #FF5C03;">+{{integralInfo.integralRatio||0}}</text>币</view>
+									<view v-show="item.id==5">填写即送<text style="color: #FF5C03;">+{{integralInfo.integralFollow||0}}币/条</text></view>
+									<view v-show="item.id==6">分享至微信、朋友圈<text style="color: #FF5C03;">+{{integralInfo.integralShare||0}}币/条</text></view>
 								</view>
 								</view>
 								<view class="task-btn" @tap="handleDayTask(item)">{{item.btntxt}}</view>
 								<view class="task-btn" @tap="handleDayTask(item)">{{item.btntxt}}</view>
 							</view>
 							</view>
@@ -151,7 +151,7 @@
 								<block v-else-if="index==2">
 								<block v-else-if="index==2">
 									<view>
 									<view>
 										<view class="task-title">{{item.title}}</view>
 										<view class="task-title">{{item.title}}</view>
-										<view>下单后返现<span style='color:#FF5C03'>{{integralInfo.integralNewTask||0}}</span>芳华币</view>
+										<view>下单后返现<span style='color:#FF5C03'>{{integralInfo.integralNewTask||0}}</span>币</view>
 										<view v-if="isNewUser && userBenefits.taskThree==0" class="es-mt-5">截止时间:{{countdownText}}</view>
 										<view v-if="isNewUser && userBenefits.taskThree==0" class="es-mt-5">截止时间:{{countdownText}}</view>
 									</view>
 									</view>
 									<view v-if="isNewUser && userBenefits.taskThree==0" class="task-btn" @tap="loginNavTo(item.pageUrl)" >{{ "去完成" }}</view>
 									<view v-if="isNewUser && userBenefits.taskThree==0" class="task-btn" @tap="loginNavTo(item.pageUrl)" >{{ "去完成" }}</view>
@@ -183,7 +183,7 @@
 								<block v-else>
 								<block v-else>
 									<view>
 									<view>
 										<view class="task-title">{{item.title}}</view>
 										<view class="task-title">{{item.title}}</view>
-										<view>填码即得<text style='color:#FF5C03'>+{{integralInfo.integralInvited||0}}</text>芳华币</view>
+										<view>填码即得<text style='color:#FF5C03'>+{{integralInfo.integralInvited||0}}</text>币</view>
 									</view>
 									</view>
 									<template v-if="item.title =='填写朋友邀请码'" >
 									<template v-if="item.title =='填写朋友邀请码'" >
 										<view v-if="userBenefits.taskSix==1" class="task-btn task-btn-finish">已领取</view>
 										<view v-if="userBenefits.taskSix==1" class="task-btn task-btn-finish">已领取</view>
@@ -197,7 +197,7 @@
 						
 						
 						<view v-if="item.title =='填写朋友邀请码'&&userBenefits.taskSix!=1" class="invitation-code">
 						<view v-if="item.title =='填写朋友邀请码'&&userBenefits.taskSix!=1" class="invitation-code">
 							<view>
 							<view>
-								<input class="input" v-model.trim="invitationCode" maxlength="50" :placeholder-style="placeholderStyle" placeholder="填码得芳华币" />
+								<input class="input" v-model.trim="invitationCode" maxlength="50" :placeholder-style="placeholderStyle" placeholder="填码得币" />
 							</view>
 							</view>
 							<button :class="!invitationCode ? 'task-btn task-btn-disable':'task-btn'" :disabled="bindLoading" :loading="bindLoading" @click="bindCode">{{item.btntxt}}</button>
 							<button :class="!invitationCode ? 'task-btn task-btn-disable':'task-btn'" :disabled="bindLoading" :loading="bindLoading" @click="bindCode">{{item.btntxt}}</button>
 						</view>
 						</view>
@@ -212,7 +212,7 @@
 		      	温馨提示
 		      	温馨提示
 		      </view>
 		      </view>
 		      <view class="desc">
 		      <view class="desc">
-		      	您有{{withdrawIntegral}}芳华币可兑换现金<text style="color:#FF5C03;">{{withdrawCash}}元,</text>是否兑换?
+		      	您有{{withdrawIntegral}}币可兑换现金<text style="color:#FF5C03;">{{withdrawCash}}元,</text>是否兑换?
 		      </view>
 		      </view>
 		      <view class="tips x-f">
 		      <view class="tips x-f">
 		      	<image src="@/static/images/integral/stunning_degree.png"></image>
 		      	<image src="@/static/images/integral/stunning_degree.png"></image>
@@ -302,24 +302,24 @@
 						icon: '/static/images/integral/first_order_icon.png',
 						icon: '/static/images/integral/first_order_icon.png',
 						pageUrl:"/pages/store/packageList",
 						pageUrl:"/pages/store/packageList",
 						title: '首单立返',
 						title: '首单立返',
-						desc: "下单后返现<span style='color:#FF5C03'>5000</span>芳华币",
+						desc: "下单后返现<span style='color:#FF5C03'>5000</span>币",
 						btntxt: '去下单',
 						btntxt: '去下单',
 					},{
 					},{
 						icon: '/static/images/integral/patient_information_icon.png',
 						icon: '/static/images/integral/patient_information_icon.png',
 						pageUrl:"/pages/user/patient",
 						pageUrl:"/pages/user/patient",
 						title: '填写就诊人信息',
 						title: '填写就诊人信息',
-						desc: "填写即送<span style='color:#FF5C03'>+1000</span>芳华币",
+						desc: "填写即送<span style='color:#FF5C03'>+1000</span>币",
 						btntxt: '去填写',
 						btntxt: '去填写',
 					},{
 					},{
 						icon: '/static/images/integral/address_icon.png',
 						icon: '/static/images/integral/address_icon.png',
 						pageUrl:"/pages/user/address",
 						pageUrl:"/pages/user/address",
 						title: '填写收货地址',
 						title: '填写收货地址',
-						desc: "填写即送<span style='color:#FF5C03'>+1000</span>芳华币",
+						desc: "填写即送<span style='color:#FF5C03'>+1000</span>币",
 						btntxt: '去填写',
 						btntxt: '去填写',
 					},{
 					},{
 						icon: '/static/images/integral/invitation_code_icon.png',
 						icon: '/static/images/integral/invitation_code_icon.png',
 						title: '填写朋友邀请码',
 						title: '填写朋友邀请码',
-						desc: "填码即得<span style='color:#FF5C03'>+2000</span>芳华币",
+						desc: "填码即得<span style='color:#FF5C03'>+2000</span>币",
 						btntxt: '领奖励',
 						btntxt: '领奖励',
 					}
 					}
 				],
 				],
@@ -330,49 +330,49 @@
 							id:0,
 							id:0,
 							icon: '/static/images/integral/ssp_icon.png',
 							icon: '/static/images/integral/ssp_icon.png',
 							title: '刷视频',
 							title: '刷视频',
-							desc: "每次浏览<span style='color:#FF5C03'>10秒</span>可获取1次芳华币",
+							desc: "每次浏览<span style='color:#FF5C03'>10秒</span>可获取1次币",
 							btntxt: '去逛逛',
 							btntxt: '去逛逛',
 							isVideo:true,
 							isVideo:true,
 						},{
 						},{
 							id:1,
 							id:1,
 							icon: '/static/images/integral/ssp_icon.png',
 							icon: '/static/images/integral/ssp_icon.png',
 							title: '发布视频',
 							title: '发布视频',
-							desc: "每日首次成功发布视频<span style='color:#FF5C03'>+100</span>芳华币",
+							desc: "每日首次成功发布视频<span style='color:#FF5C03'>+100</span>币",
 							btntxt: '去发布',
 							btntxt: '去发布',
 							pageUrl:"/pages/expert/index"
 							pageUrl:"/pages/expert/index"
 						},{
 						},{
 							id:2,
 							id:2,
 							icon: '/static/images/integral/kzb_icon.png',
 							icon: '/static/images/integral/kzb_icon.png',
 							title: '看直播',
 							title: '看直播',
-							desc: "每次浏览<span style='color:#FF5C03'>10秒</span>可获取1次芳华币",
+							desc: "每次浏览<span style='color:#FF5C03'>10秒</span>可获取1次币",
 							btntxt: '去观看',
 							btntxt: '去观看',
 							isLive:true,
 							isLive:true,
 						},{
 						},{
 							id:3,
 							id:3,
 							icon: '/static/images/integral/xxkc_icon.png',
 							icon: '/static/images/integral/xxkc_icon.png',
 							title: '学习课程',
 							title: '学习课程',
-							desc: "每集<span style='color:#FF5C03'>+200</span>芳华币",
+							desc: "每集<span style='color:#FF5C03'>+200</span>币",
 							btntxt: '去学习',
 							btntxt: '去学习',
 							isCourse:true,
 							isCourse:true,
 						},{
 						},{
 							id:4,
 							id:4,
 							icon: '/static/images/integral/xfdjf_icon.png',
 							icon: '/static/images/integral/xfdjf_icon.png',
-							title: '消费得芳华币',
-							desc: "实际消费满1元<span style='color:#FF5C03'>+1</span>芳华币",
+							title: '消费得币',
+							desc: "实际消费满1元<span style='color:#FF5C03'>+1</span>币",
 							btntxt: '去逛逛',
 							btntxt: '去逛逛',
 							pageUrl:"/pages/store/packageList"
 							pageUrl:"/pages/store/packageList"
 						},{
 						},{
 							id:5,
 							id:5,
 							icon: '/static/images/integral/txyysf_icon.png',
 							icon: '/static/images/integral/txyysf_icon.png',
 							title: '填写用药随访',
 							title: '填写用药随访',
-							desc: "填写即送<span style='color:#FF5C03'>+50芳华币/条</span>",
+							desc: "填写即送<span style='color:#FF5C03'>+50币/条</span>",
 							btntxt: '去填写',
 							btntxt: '去填写',
 							pageUrl:"/pages/user/followList"
 							pageUrl:"/pages/user/followList"
 						},{
 						},{
 							id:6,
 							id:6,
 							icon: '/static/images/integral/fxjkzs_icon.png',
 							icon: '/static/images/integral/fxjkzs_icon.png',
 							title: '分享健康知识',
 							title: '分享健康知识',
-							desc: "分享至微信、朋友圈<span style='color:#FF5C03'>+10芳华币/条</span>",
+							desc: "分享至微信、朋友圈<span style='color:#FF5C03'>+10币/条</span>",
 							btntxt: '去分享',
 							btntxt: '去分享',
 						},{
 						},{
 							id:7,
 							id:7,
@@ -438,7 +438,7 @@
 				if(this.withdrawIntegral==0){
 				if(this.withdrawIntegral==0){
 					uni.showToast({
 					uni.showToast({
 						icon:'none',
 						icon:'none',
-						title:"您没有可兑换的芳华币",
+						title:"您没有可兑换的币",
 					});
 					});
 					return;
 					return;
 				}
 				}

+ 11 - 11
pages/user/integralInfo.vue

@@ -24,7 +24,7 @@
 				<view class="es-h-180 es-icon-auto es-icon-integral-bg es-view-w-x">
 				<view class="es-h-180 es-icon-auto es-icon-integral-bg es-view-w-x">
 					<view class="es es-mt-15">
 					<view class="es es-mt-15">
 						<view class="es-icon-36 es-h-33 es-icon-integral"></view>
 						<view class="es-icon-36 es-h-33 es-icon-integral"></view>
-						<view class="es-ml-20 es-fw-500 es-fs-30">我的芳华币</view>
+						<view class="es-ml-20 es-fw-500 es-fs-30">我的币</view>
 					</view>
 					</view>
 					<view class="es es-ac es-mt-20">
 					<view class="es es-ac es-mt-20">
 						<view class="es-f1 es-fw-600 es-c es-fs-56">12002.00</view>
 						<view class="es-f1 es-fw-600 es-c es-fs-56">12002.00</view>
@@ -34,7 +34,7 @@
 
 
 				<view class="es-pt-30">
 				<view class="es-pt-30">
 					<view class="es">
 					<view class="es">
-						<view class="es-f1 es-fs-30 es-fw-600">连续签到领芳华币</view>
+						<view class="es-f1 es-fs-30 es-fw-600">连续签到领币</view>
 						<view class="es-c-99 es-fs-22">签到2天</view>
 						<view class="es-c-99 es-fs-22">签到2天</view>
 					</view>
 					</view>
 
 
@@ -57,7 +57,7 @@
 							<view class="es-fs-28 es-fw-500">新人福利</view>
 							<view class="es-fs-28 es-fw-500">新人福利</view>
 							<view class="es es-ac">
 							<view class="es es-ac">
 								<view class="es-icon-24 es-icon-integral-star es-mr-7"></view>
 								<view class="es-icon-24 es-icon-integral-star es-mr-7"></view>
-								<view class="es-f1 es-omit es-fs-22">一次性任务(<text>+1000</text>芳华币)</view>
+								<view class="es-f1 es-omit es-fs-22">一次性任务(<text>+1000</text>币)</view>
 							</view>
 							</view>
 						</view>
 						</view>
 						<view class="es-fs-22 es-w-130 es-h-42 es-br es es-ac es-pc es-bc es-on-act">去完成</view>
 						<view class="es-fs-22 es-w-130 es-h-42 es-br es es-ac es-pc es-bc es-on-act">去完成</view>
@@ -70,7 +70,7 @@
 							<view class="es-fs-28 es-fw-500">填写您的收货地址</view>
 							<view class="es-fs-28 es-fw-500">填写您的收货地址</view>
 							<view class="es es-ac">
 							<view class="es es-ac">
 								<view class="es-icon-24 es-icon-integral-star es-mr-7"></view>
 								<view class="es-icon-24 es-icon-integral-star es-mr-7"></view>
-								<view class="es-f1 es-omit es-fs-22">一次性任务(<text>+1000</text>芳华币)</view>
+								<view class="es-f1 es-omit es-fs-22">一次性任务(<text>+1000</text>币)</view>
 							</view>
 							</view>
 						</view>
 						</view>
 						<view class="es-fs-22 es-w-130 es-h-42 es-br es es-ac es-pc es-bc es-on-act">去完成</view>
 						<view class="es-fs-22 es-w-130 es-h-42 es-br es es-ac es-pc es-bc es-on-act">去完成</view>
@@ -104,7 +104,7 @@
 							<view class="es-fs-28 es-fw-500">刷视频</view>
 							<view class="es-fs-28 es-fw-500">刷视频</view>
 							<view class="es es-ac">
 							<view class="es es-ac">
 								<!-- <view class="es-icon-24 es-icon-integral-star es-mr-7"></view> -->
 								<!-- <view class="es-icon-24 es-icon-integral-star es-mr-7"></view> -->
-								<view class="es-f1 es-omit es-fs-22">每浏览10s获取1次芳华币</view>
+								<view class="es-f1 es-omit es-fs-22">每浏览10s获取1次币</view>
 							</view>
 							</view>
 						</view>
 						</view>
 						<view class="es-fs-22 es-w-130 es-h-42 es-br es es-ac es-pc es-bc es-on-act">去逛逛</view>
 						<view class="es-fs-22 es-w-130 es-h-42 es-br es es-ac es-pc es-bc es-on-act">去逛逛</view>
@@ -117,7 +117,7 @@
 							<view class="es-fs-28 es-fw-500">看直播</view>
 							<view class="es-fs-28 es-fw-500">看直播</view>
 							<view class="es es-ac">
 							<view class="es es-ac">
 								<!-- <view class="es-icon-24 es-icon-integral-star es-mr-7"></view> -->
 								<!-- <view class="es-icon-24 es-icon-integral-star es-mr-7"></view> -->
-								<view class="es-f1 es-omit es-fs-22">每浏览10s获取1次芳华币</view>
+								<view class="es-f1 es-omit es-fs-22">每浏览10s获取1次币</view>
 							</view>
 							</view>
 						</view>
 						</view>
 						<view class="es-fs-22 es-w-130 es-h-42 es-br es es-ac es-pc es-bc es-on-act">去观看</view>
 						<view class="es-fs-22 es-w-130 es-h-42 es-br es es-ac es-pc es-bc es-on-act">去观看</view>
@@ -130,7 +130,7 @@
 							<view class="es-fs-28 es-fw-500">学习课程</view>
 							<view class="es-fs-28 es-fw-500">学习课程</view>
 							<view class="es es-ac">
 							<view class="es es-ac">
 								<!-- <view class="es-icon-24 es-icon-integral-star es-mr-7"></view> -->
 								<!-- <view class="es-icon-24 es-icon-integral-star es-mr-7"></view> -->
-								<view class="es-f1 es-omit es-fs-22">每集+200芳华币</view>
+								<view class="es-f1 es-omit es-fs-22">每集+200币</view>
 							</view>
 							</view>
 						</view>
 						</view>
 						<view class="es-fs-22 es-w-130 es-h-42 es-br es es-ac es-pc es-bc es-on-act">去学习</view>
 						<view class="es-fs-22 es-w-130 es-h-42 es-br es es-ac es-pc es-bc es-on-act">去学习</view>
@@ -140,10 +140,10 @@
 							<view class="es-icon-53 es-h-60 es-icon-integral-2"></view>
 							<view class="es-icon-53 es-h-60 es-icon-integral-2"></view>
 						</view>
 						</view>
 						<view class="es-f1 es-ml-19">
 						<view class="es-f1 es-ml-19">
-							<view class="es-fs-28 es-fw-500">消费得芳华币</view>
+							<view class="es-fs-28 es-fw-500">消费得币</view>
 							<view class="es es-ac">
 							<view class="es es-ac">
 								<!-- <view class="es-icon-24 es-icon-integral-star es-mr-7"></view> -->
 								<!-- <view class="es-icon-24 es-icon-integral-star es-mr-7"></view> -->
-								<view class="es-f1 es-omit es-fs-22">实际消费满1元+1芳华币</view>
+								<view class="es-f1 es-omit es-fs-22">实际消费满1元+1币</view>
 							</view>
 							</view>
 						</view>
 						</view>
 						<view class="es-fs-22 es-w-130 es-h-42 es-br es es-ac es-pc es-bc es-on-act">去逛逛</view>
 						<view class="es-fs-22 es-w-130 es-h-42 es-br es es-ac es-pc es-bc es-on-act">去逛逛</view>
@@ -156,7 +156,7 @@
 							<view class="es-fs-28 es-fw-500">分享健康知识</view>
 							<view class="es-fs-28 es-fw-500">分享健康知识</view>
 							<view class="es es-ac">
 							<view class="es es-ac">
 								<!-- <view class="es-icon-24 es-icon-integral-star es-mr-7"></view> -->
 								<!-- <view class="es-icon-24 es-icon-integral-star es-mr-7"></view> -->
-								<view class="es-f1 es-omit es-fs-22">分享至微信、朋友圈,+10芳华币/条</view>
+								<view class="es-f1 es-omit es-fs-22">分享至微信、朋友圈,+10币/条</view>
 							</view>
 							</view>
 						</view>
 						</view>
 						<view class="es-fs-22 es-w-130 es-h-42 es-br es es-ac es-pc es-bc es-on-act">去分享</view>
 						<view class="es-fs-22 es-w-130 es-h-42 es-br es es-ac es-pc es-bc es-on-act">去分享</view>
@@ -169,7 +169,7 @@
 							<view class="es-fs-28 es-fw-500">填写用药随访</view>
 							<view class="es-fs-28 es-fw-500">填写用药随访</view>
 							<view class="es es-ac">
 							<view class="es es-ac">
 								<!-- <view class="es-icon-24 es-icon-integral-star es-mr-7"></view> -->
 								<!-- <view class="es-icon-24 es-icon-integral-star es-mr-7"></view> -->
-								<view class="es-f1 es-omit es-fs-22">+50芳华币/条</view>
+								<view class="es-f1 es-omit es-fs-22">+50币/条</view>
 							</view>
 							</view>
 						</view>
 						</view>
 						<view class="es-fs-22 es-w-130 es-h-42 es-br es es-ac es-pc es-bc es-on-act">去填写</view>
 						<view class="es-fs-22 es-w-130 es-h-42 es-br es es-ac es-pc es-bc es-on-act">去填写</view>

+ 5 - 5
pages/user/integralMall.vue

@@ -1,15 +1,15 @@
 <template>
 <template>
 	<view>
 	<view>
-		<es-nav-bg title="芳华币商城" ref="esNavBg"></es-nav-bg>
+		<es-nav-bg title="币商城" ref="esNavBg"></es-nav-bg>
 
 
 		<view class="es-view-w-x es-mt-10">
 		<view class="es-view-w-x es-mt-10">
 			<view class="es-icon-user-bg es-h-180 es-icon-auto">
 			<view class="es-icon-user-bg es-h-180 es-icon-auto">
 				<view class="es-view-w-x es-h-80 es es-ac">
 				<view class="es-view-w-x es-h-80 es es-ac">
 					<view class="es-icon es-w-36 es-h-33 es-icon-user-integral"></view>
 					<view class="es-icon es-w-36 es-h-33 es-icon-user-integral"></view>
-					<view class="es-f1 es-fw-500 es-fs-30 es-ml-20">我的芳华币</view>
+					<view class="es-f1 es-fw-500 es-fs-30 es-ml-20">我的币</view>
 					<view class="es-w-162 es-h-42 es-icon-user-bg1 es-icon es es-ac es-pc">
 					<view class="es-w-162 es-h-42 es-icon-user-bg1 es-icon es es-ac es-pc">
 						<view class="es-icon-25 es-icon-user-btn1"></view>
 						<view class="es-icon-25 es-icon-user-btn1"></view>
-						<view class="es-fs-22 es-ml-9">芳华币记录</view>
+						<view class="es-fs-22 es-ml-9">币记录</view>
 					</view>
 					</view>
 				</view>
 				</view>
 				<view class="es-h-100 es-view-w-x es es-ac">
 				<view class="es-h-100 es-view-w-x es es-ac">
@@ -17,7 +17,7 @@
 						<view class="es-fs-56 es-fw-600">123456.00</view>
 						<view class="es-fs-56 es-fw-600">123456.00</view>
 						<view class="es es-ac es-mt-10 es-ml-30">
 						<view class="es es-ac es-mt-10 es-ml-30">
 							<view class="es-icon es-w-31 es-h-25 es-icon-user-get"></view>
 							<view class="es-icon es-w-31 es-h-25 es-icon-user-get"></view>
-							<view class="es-ml-6 es-fw-600 es-fs-22 es-c">获取芳华币</view>
+							<view class="es-ml-6 es-fw-600 es-fs-22 es-c">获取币</view>
 						</view>
 						</view>
 					</view>
 					</view>
 					<view class="es-w-162 es-h-42 es-icon-user-bg1 es-icon es es-ac es-pc">
 					<view class="es-w-162 es-h-42 es-icon-user-bg1 es-icon es es-ac es-pc">
@@ -60,7 +60,7 @@
 						</view>
 						</view>
 						<view class="es es-pb-22 es-mt-10">
 						<view class="es es-pb-22 es-mt-10">
 							<view class="es-icon-23 es-h-25 es-icon-user-change"></view>
 							<view class="es-icon-23 es-h-25 es-icon-user-change"></view>
-							<view class="es-c es-fs-22 es-ml-10">1230芳华币</view>
+							<view class="es-c es-fs-22 es-ml-10">1230币</view>
 							<view class="es-f1 es-tr es-fs-22 es-c-99">原价:198元</view>
 							<view class="es-f1 es-tr es-fs-22 es-c-99">原价:198元</view>
 						</view>
 						</view>
 					</view>
 					</view>

+ 2 - 2
pages/user/wallet/commissionLogsList.vue

@@ -5,9 +5,9 @@
 			<view class="logs-item" v-for="(item,index) in dataList" :key="index">
 			<view class="logs-item" v-for="(item,index) in dataList" :key="index">
 				<view class="left">
 				<view class="left">
 					<text class="title"  >
 					<text class="title"  >
-                       芳华币兑换
+                       币兑换
 					</text>
 					</text>
-					<view class="time">芳华币:{{item.integral}}</view>
+					<view class="time">币:{{item.integral}}</view>
 				</view>
 				</view>
 				<view class="right">
 				<view class="right">
 					<text class="money origin">兑换+{{item.commission}}</text>
 					<text class="money origin">兑换+{{item.commission}}</text>

+ 5 - 5
pages/user/wallet/index.vue

@@ -28,7 +28,7 @@
 						<view class="wbtn" v-if="!$isIos()"  @click="navTo('/pages/user/wallet/addApply')">去提现</view>
 						<view class="wbtn" v-if="!$isIos()"  @click="navTo('/pages/user/wallet/addApply')">去提现</view>
 					</view>
 					</view>
 					<view class="fanghua x-f">
 					<view class="fanghua x-f">
-						您有{{info.withdrawIntegral||0}}芳华币可兑换
+						您有{{info.withdrawIntegral||0}}币可兑换
 						<view v-if="info.withdrawIntegral!==0&&!$isIos()" class="duihuan" @click="openBox">【去兑换】</view>
 						<view v-if="info.withdrawIntegral!==0&&!$isIos()" class="duihuan" @click="openBox">【去兑换】</view>
 					</view>
 					</view>
 					<view class="box-bottom x-ac">
 					<view class="box-bottom x-ac">
@@ -70,13 +70,13 @@
 					<view class="taskloglist">
 					<view class="taskloglist">
 						<view class="item y-bc" v-for="(item,index) in dataList" :key="index">
 						<view class="item y-bc" v-for="(item,index) in dataList" :key="index">
 							<view class="share x-bc">
 							<view class="share x-bc">
-								<view class="type">芳华币兑换</view>
+								<view class="type">币兑换</view>
 								<view class="total">
 								<view class="total">
 									兑换<text class="num">+{{item.commission}}</text>
 									兑换<text class="num">+{{item.commission}}</text>
 								</view>
 								</view>
 							</view>
 							</view>
 							<view class="amount x-bc">
 							<view class="amount x-bc">
-								<view>芳华币:{{item.integral}}</view>
+								<view>币:{{item.integral}}</view>
 								<view>{{item.createTime}}</view>
 								<view>{{item.createTime}}</view>
 							</view>
 							</view>
 						</view>
 						</view>
@@ -91,7 +91,7 @@
 				  温馨提示
 				  温馨提示
 			  </view>
 			  </view>
 			  <view class="desc">
 			  <view class="desc">
-				  您有{{info.withdrawIntegral}}芳华币可兑换现金<text style="color:#FF5C03;">{{info.withdrawCash}}元,</text>是否兑换?
+				  您有{{info.withdrawIntegral}}币可兑换现金<text style="color:#FF5C03;">{{info.withdrawCash}}元,</text>是否兑换?
 			  </view>
 			  </view>
 			  <view class="tips x-f">
 			  <view class="tips x-f">
 			  	<image src="@/static/images/integral/stunning_degree.png"></image>
 			  	<image src="@/static/images/integral/stunning_degree.png"></image>
@@ -206,7 +206,7 @@
 				if(this.info.withdrawIntegral==0){
 				if(this.info.withdrawIntegral==0){
 					uni.showToast({
 					uni.showToast({
 						icon:'none',
 						icon:'none',
-						title:"您没有可兑换的芳华币",
+						title:"您没有可兑换的币",
 					});
 					});
 					return;
 					return;
 				}
 				}

+ 1 - 1
pages_live/components/giftPopup.vue

@@ -3,7 +3,7 @@
  	<view class="more-block">
  	<view class="more-block">
  		<view class="item" @click="navgetTo('/pages/user/integral/integralGoodsList'), (isMore = false)">
  		<view class="item" @click="navgetTo('/pages/user/integral/integralGoodsList'), (isMore = false)">
  			<image class="icon" src="/static/images/live/order.png" />
  			<image class="icon" src="/static/images/live/order.png" />
- 			<view style="text-align: center">芳华币</view>
+ 			<view style="text-align: center">币</view>
  		</view>
  		</view>
  		<view class="item"
  		<view class="item"
  			@click="navgetTo('/pages_shopping/live/storeOrderRefundList?liveId=' + liveId), (isMore = false)">
  			@click="navgetTo('/pages_shopping/live/storeOrderRefundList?liveId=' + liveId), (isMore = false)">

+ 1 - 1
pages_live/components/lotteryPopup.vue

@@ -1,5 +1,5 @@
 <template>
 <template>
-  <u-popup :show="show && countdown" round="40rpx" @close="handleClose">
+  <u-popup :show="show" round="40rpx" @close="handleClose">
     <view class="prize-box" style="border-radius: 40rpx; height: fit-content">
     <view class="prize-box" style="border-radius: 40rpx; height: fit-content">
       <image class="nav-img" src="/static/images/live/red_head.png" mode="widthFix" />
       <image class="nav-img" src="/static/images/live/red_head.png" mode="widthFix" />
       <image class="bg-img" src="/static/images/live/red_bg.png" />
       <image class="bg-img" src="/static/images/live/red_bg.png" />

+ 8 - 8
pages_live/living - 副本.vue

@@ -159,7 +159,7 @@
 			<u-popup :show="!!integral.status" round="20rpx" mode="center" bgColor="#ffffff" zIndex="10076">
 			<u-popup :show="!!integral.status" round="20rpx" mode="center" bgColor="#ffffff" zIndex="10076">
 				<view class="integral-box">
 				<view class="integral-box">
 					<view class="top">
 					<view class="top">
-						<view class="title">观看视频领芳华币</view>
+						<view class="title">观看视频领币</view>
 						<image class="photo" src="/static/images/live/integral_bg.png" mode="widthFix" />
 						<image class="photo" src="/static/images/live/integral_bg.png" mode="widthFix" />
 					</view>
 					</view>
 					<view class="item">
 					<view class="item">
@@ -188,7 +188,7 @@
 					<image class="img" src="/static/images/live/red_card.png" />
 					<image class="img" src="/static/images/live/red_card.png" />
 					<view class="red-content">
 					<view class="red-content">
 						<view class="title">{{ redCard.msg }}</view>
 						<view class="title">{{ redCard.msg }}</view>
-						<view class="txt">直播惊喜芳华币</view>
+						<view class="txt">直播惊喜币</view>
 						<view class="button" @click="isShowRedCard = false">确认</view>
 						<view class="button" @click="isShowRedCard = false">确认</view>
 					</view>
 					</view>
 				</view>
 				</view>
@@ -230,7 +230,7 @@
 					<view class="item" @click="navgetTo('/pages/user/integral/integralGoodsList'), (isMore = false)">
 					<view class="item" @click="navgetTo('/pages/user/integral/integralGoodsList'), (isMore = false)">
 						<image class="w48 h48" src="/static/image/my/member_icon.png" />
 						<image class="w48 h48" src="/static/image/my/member_icon.png" />
 						
 						
-						<view style="text-align: center">芳华币</view>
+						<view style="text-align: center">币</view>
 					</view>
 					</view>
 					<view class="item" @click="goOrder(), (isMore = false)">
 					<view class="item" @click="goOrder(), (isMore = false)">
 						<image class="w48 h48" src="/static/image/my/my_cforder_icon.png" />
 						<image class="w48 h48" src="/static/image/my/my_cforder_icon.png" />
@@ -268,7 +268,7 @@
 							<image class="w104 h104" :src="item.img" />
 							<image class="w104 h104" :src="item.img" />
 							<view class="name">{{ item.giftName }}</view>
 							<view class="name">{{ item.giftName }}</view>
 							<view v-if="activeIndex === index" class="button" @click="sendliveGift(item)">赠送</view>
 							<view v-if="activeIndex === index" class="button" @click="sendliveGift(item)">赠送</view>
-							<view class="number" v-else>{{ item.price }}芳华币</view>
+							<view class="number" v-else>{{ item.price }}币</view>
 						</view>
 						</view>
 					</view>
 					</view>
 				</view>
 				</view>
@@ -359,7 +359,7 @@
 		receivePoints,
 		receivePoints,
 		activeList,
 		activeList,
 		sendliveGift,
 		sendliveGift,
-		getUserIntegralInfo, //芳华
+		getUserIntegralInfo, //
 		loginByMp,
 		loginByMp,
 	    getUserLiveInfo
 	    getUserLiveInfo
 
 
@@ -397,7 +397,7 @@
 					`https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/userapp/images/avatar${i + 1}.jpg`),
 					`https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/userapp/images/avatar${i + 1}.jpg`),
 					paddingTop: uni.getSystemInfoSync().statusBarHeight + 44,
 					paddingTop: uni.getSystemInfoSync().statusBarHeight + 44,
 				hasSubscribed: false, // 已成功订阅(永久禁用)
 				hasSubscribed: false, // 已成功订阅(永久禁用)
-				integralNum: null, //礼物芳华币数量
+				integralNum: null, //礼物币数量
 				isPreview: true, //是否预告
 				isPreview: true, //是否预告
 				hasReplayGeneration: false, //是否经历回放生成
 				hasReplayGeneration: false, //是否经历回放生成
 				diffLiveStartTime: 0, //距离直播开始时间差值
 				diffLiveStartTime: 0, //距离直播开始时间差值
@@ -957,7 +957,7 @@
 			}
 			}
 		},
 		},
 		methods: { 
 		methods: { 
-			// 芳华
+			// 
 			// 微信昵称授权相关方法
 			// 微信昵称授权相关方法
 			shouquan() {
 			shouquan() {
 				if (this.user.nickname == '') {
 				if (this.user.nickname == '') {
@@ -1129,7 +1129,7 @@
 						this.integralNum = res.data.integral
 						this.integralNum = res.data.integral
 					}
 					}
 				}).catch(error => {
 				}).catch(error => {
-					console.error("获取芳华币数据失败:", error);
+					console.error("获取币数据失败:", error);
 
 
 				});
 				});
 			},
 			},

+ 10 - 8
pages_live/living.vue

@@ -21,7 +21,7 @@
 						<!-- 积分倒计时 -->
 						<!-- 积分倒计时 -->
 						<view class="progress-countdown" :class="liveItem.showType == 2 ? ' progress-vertical' : ''"
 						<view class="progress-countdown" :class="liveItem.showType == 2 ? ' progress-vertical' : ''"
 							:style="{ 'display': isFocus ? 'none' : '' }"
 							:style="{ 'display': isFocus ? 'none' : '' }"
-							v-if="countdownPercentage != 100 && liveItem.completionPointsEnabled && liveItem.status == 2 && !isPreview">
+							v-if="countdownPercentage != 100 && liveItem.completionPointsEnabled && liveItem.liveType != 1 && !isPreview">
 							<image class="title" src="/static/images/live/points_title.png"></image>
 							<image class="title" src="/static/images/live/points_title.png"></image>
 							<view class="progress-bar-bg">
 							<view class="progress-bar-bg">
 								<view class="progress-bar-fill" :style="{ width: countdownPercentage + '%' }"></view>
 								<view class="progress-bar-fill" :style="{ width: countdownPercentage + '%' }"></view>
@@ -151,7 +151,7 @@
 				@close="handleCloseGoods" />
 				@close="handleCloseGoods" />
 
 
 			<!-- 抽奖弹窗 -->
 			<!-- 抽奖弹窗 -->
-			<LotteryPopup :show="isShowLotteryPop && countdown" :countdown="countdown" :products="lotteryProducts"
+			<LotteryPopup :show="isShowLotteryPop" :countdown="countdown" :products="lotteryProducts"
 				@close="handleLotteryClose" @claim="handleLotteryClaim" />
 				@close="handleLotteryClose" @claim="handleLotteryClaim" />
 
 
 			<u-popup :show="!!integral.status" round="20rpx" mode="center" bgColor="#ffffff" zIndex="10076">
 			<u-popup :show="!!integral.status" round="20rpx" mode="center" bgColor="#ffffff" zIndex="10076">
@@ -357,7 +357,7 @@
 		receivePoints,
 		receivePoints,
 		activeList,
 		activeList,
 		sendliveGift,
 		sendliveGift,
-		getUserIntegralInfo, //芳华
+		getUserIntegralInfo, //
 		loginByMp,
 		loginByMp,
 	    getUserLiveInfo
 	    getUserLiveInfo
 
 
@@ -395,7 +395,7 @@
 					`https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/userapp/images/avatar${i + 1}.jpg`),
 					`https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/userapp/images/avatar${i + 1}.jpg`),
 					paddingTop: uni.getSystemInfoSync().statusBarHeight + 44,
 					paddingTop: uni.getSystemInfoSync().statusBarHeight + 44,
 				hasSubscribed: false, // 已成功订阅(永久禁用)
 				hasSubscribed: false, // 已成功订阅(永久禁用)
-				integralNum: null, //礼物芳华币数量
+				integralNum: null, //礼物币数量
 				isPreview: true, //是否预告
 				isPreview: true, //是否预告
 				hasReplayGeneration: false, //是否经历回放生成
 				hasReplayGeneration: false, //是否经历回放生成
 				diffLiveStartTime: 0, //距离直播开始时间差值
 				diffLiveStartTime: 0, //距离直播开始时间差值
@@ -999,7 +999,7 @@
 			// 			(rej) => {}
 			// 			(rej) => {}
 			// 		)
 			// 		)
 			// },
 			// },
-			// 芳华
+			// 
 			// 微信昵称授权相关方法
 			// 微信昵称授权相关方法
 			shouquan() {
 			shouquan() {
 				if (this.user.nickname == '') {
 				if (this.user.nickname == '') {
@@ -1433,7 +1433,7 @@
 				if (this.diffLiveStartTime >= 0) {
 				if (this.diffLiveStartTime >= 0) {
 					this.isPreview = false;
 					this.isPreview = false;
 				}
 				}
-
+				
 				this.completionTime = this.liveItem.duration * this.completionRate * 0.01;
 				this.completionTime = this.liveItem.duration * this.completionRate * 0.01;
 
 
 				// 已达成观看时间
 				// 已达成观看时间
@@ -1492,7 +1492,7 @@
 					}
 					}
 
 
 					// 积分领取满足条件
 					// 积分领取满足条件
-					if (this.totalWatchTime >= this.completionTime) {
+					if (this.totalWatchTime >= this.completionTime && this.liveItem.liveType != 1) {
 						if (this.countdownTimer) {
 						if (this.countdownTimer) {
 							clearInterval(this.countdownTimer);
 							clearInterval(this.countdownTimer);
 							this.countdownTimer = null;
 							this.countdownTimer = null;
@@ -3804,7 +3804,7 @@
 							cmd: socketMessage.cmd || '',
 							cmd: socketMessage.cmd || '',
 							ts: Date.now()
 							ts: Date.now()
 						}
 						}
-						console.log('websocketlist',message)
+						// console.log('websocketlist',message)
 						if (socketMessage.cmd == 'sendMsg') {
 						if (socketMessage.cmd == 'sendMsg') {
 							if (!this.isSocketAvailable()) {
 							if (!this.isSocketAvailable()) {
 								uni.showToast({
 								uni.showToast({
@@ -4775,6 +4775,8 @@
 			}
 			}
 
 
 			.close {
 			.close {
+				height: 40rpx;
+				width: 40rpx;
 				position: absolute;
 				position: absolute;
 				right: 10rpx;
 				right: 10rpx;
 				top: 10rpx;
 				top: 10rpx;

+ 8 - 8
pages_live/livingQ.vue

@@ -158,7 +158,7 @@
 			<u-popup :show="!!integral.status" round="20rpx" mode="center" bgColor="#ffffff" zIndex="10076">
 			<u-popup :show="!!integral.status" round="20rpx" mode="center" bgColor="#ffffff" zIndex="10076">
 				<view class="integral-box">
 				<view class="integral-box">
 					<view class="top">
 					<view class="top">
-						<view class="title">观看视频领芳华币</view>
+						<view class="title">观看视频领币</view>
 						<image class="photo" src="/static/images/live/integral_bg.png" mode="widthFix" />
 						<image class="photo" src="/static/images/live/integral_bg.png" mode="widthFix" />
 					</view>
 					</view>
 					<view class="item">
 					<view class="item">
@@ -187,7 +187,7 @@
 					<image class="img" src="/static/images/live/red_card.png" />
 					<image class="img" src="/static/images/live/red_card.png" />
 					<view class="red-content">
 					<view class="red-content">
 						<view class="title">{{ redCard.msg }}</view>
 						<view class="title">{{ redCard.msg }}</view>
-						<view class="txt">直播惊喜芳华币</view>
+						<view class="txt">直播惊喜币</view>
 						<view class="button" @click="isShowRedCard = false">确认</view>
 						<view class="button" @click="isShowRedCard = false">确认</view>
 					</view>
 					</view>
 				</view>
 				</view>
@@ -227,7 +227,7 @@
 					<view class="item" @click="navgetTo('/pages/user/integral/integralGoodsList'), (isMore = false)">
 					<view class="item" @click="navgetTo('/pages/user/integral/integralGoodsList'), (isMore = false)">
 						<image class="w48 h48" src="/static/image/my/member_icon.png" />
 						<image class="w48 h48" src="/static/image/my/member_icon.png" />
 						
 						
-						<view style="text-align: center">芳华币</view>
+						<view style="text-align: center">币</view>
 					</view>
 					</view>
 					<view class="item" @click="goOrder(), (isMore = false)">
 					<view class="item" @click="goOrder(), (isMore = false)">
 						<image class="w48 h48" src="/static/image/my/my_cforder_icon.png" />
 						<image class="w48 h48" src="/static/image/my/my_cforder_icon.png" />
@@ -265,7 +265,7 @@
 							<image class="w104 h104" :src="item.img" />
 							<image class="w104 h104" :src="item.img" />
 							<view class="name">{{ item.giftName }}</view>
 							<view class="name">{{ item.giftName }}</view>
 							<view v-if="activeIndex === index" class="button" @click="sendliveGift(item)">赠送</view>
 							<view v-if="activeIndex === index" class="button" @click="sendliveGift(item)">赠送</view>
-							<view class="number" v-else>{{ item.price }}芳华币</view>
+							<view class="number" v-else>{{ item.price }}币</view>
 						</view>
 						</view>
 					</view>
 					</view>
 				</view>
 				</view>
@@ -356,7 +356,7 @@
 		receivePoints,
 		receivePoints,
 		activeList,
 		activeList,
 		sendliveGift,
 		sendliveGift,
-		getUserIntegralInfo, //芳华
+		getUserIntegralInfo, //
 		loginByMp,
 		loginByMp,
 	    getUserLiveInfo
 	    getUserLiveInfo
 
 
@@ -394,7 +394,7 @@
 					`https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/userapp/images/avatar${i + 1}.jpg`),
 					`https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/userapp/images/avatar${i + 1}.jpg`),
 					paddingTop: uni.getSystemInfoSync().statusBarHeight + 44,
 					paddingTop: uni.getSystemInfoSync().statusBarHeight + 44,
 				hasSubscribed: false, // 已成功订阅(永久禁用)
 				hasSubscribed: false, // 已成功订阅(永久禁用)
-				integralNum: null, //礼物芳华币数量
+				integralNum: null, //礼物币数量
 				isPreview: true, //是否预告
 				isPreview: true, //是否预告
 				hasReplayGeneration: false, //是否经历回放生成
 				hasReplayGeneration: false, //是否经历回放生成
 				diffLiveStartTime: 0, //距离直播开始时间差值
 				diffLiveStartTime: 0, //距离直播开始时间差值
@@ -971,7 +971,7 @@
 			}
 			}
 		},
 		},
 		methods: { 
 		methods: { 
-			// 芳华
+			// 
 			// 微信昵称授权相关方法
 			// 微信昵称授权相关方法
 			shouquan() {
 			shouquan() {
 				if (this.user.nickname == '') {
 				if (this.user.nickname == '') {
@@ -1144,7 +1144,7 @@
 						this.integralNum = res.data.integral
 						this.integralNum = res.data.integral
 					}
 					}
 				}).catch(error => {
 				}).catch(error => {
-					console.error("获取芳华币数据失败:", error);
+					console.error("获取币数据失败:", error);
 
 
 				});
 				});
 			},
 			},

+ 10 - 10
pages_live/shopping/integral.vue

@@ -10,7 +10,7 @@
 				<view class="fixed-top-box" :style="{ background: bg }">
 				<view class="fixed-top-box" :style="{ background: bg }">
 					<view class="status_bar" :style="{height: statusBarHeight}"></view>
 					<view class="status_bar" :style="{height: statusBarHeight}"></view>
 					<view class="back-box" @click="back">
 					<view class="back-box" @click="back">
-						<text class="title">我的芳华币</text>
+						<text class="title">我的币</text>
 						<text></text>
 						<text></text>
 					</view>
 					</view>
 				</view>
 				</view>
@@ -18,14 +18,14 @@
 				<view style="padding-bottom: 88upx;">
 				<view style="padding-bottom: 88upx;">
 					<view :style="{height: statusBarHeight}"></view>
 					<view :style="{height: statusBarHeight}"></view>
 				</view>
 				</view>
-				<!-- 可用芳华币 -->
+				<!-- 可用币 -->
 				<view class="available-points">
 				<view class="available-points">
-					<text class="label">可用芳华币</text>
+					<text class="label">可用币</text>
 					<text class="num">{{integral}}</text>
 					<text class="num">{{integral}}</text>
 				</view>
 				</view>
 
 
 				<view class="content">
 				<view class="content">
-					<!-- 芳华币列表 -->
+					<!-- 币列表 -->
 					<view class="points-cont">
 					<view class="points-cont">
 						<!-- tab切换 -->
 						<!-- tab切换 -->
 						<!-- <view class="pub-tab-box">
 						<!-- <view class="pub-tab-box">
@@ -70,7 +70,7 @@
 <script>
 <script>
 	import {
 	import {
 		getUserIntegralInfo
 		getUserIntegralInfo
-	} from '@/api/living.js' // 芳华
+	} from '@/api/living.js' // 
 
 
 
 
 	// import {getDictByKey} from '@/api/common.js'
 	// import {getDictByKey} from '@/api/common.js'
@@ -113,7 +113,7 @@
 			},
 			},
 		},
 		},
 		methods: {
 		methods: {
-			// 芳华
+			// 
 			getUserIntegralInfo() {
 			getUserIntegralInfo() {
 				uni.showLoading({
 				uni.showLoading({
 					title: "正在加载中..."
 					title: "正在加载中..."
@@ -121,18 +121,18 @@
 				getUserIntegralInfo().then(res => {
 				getUserIntegralInfo().then(res => {
 					uni.hideLoading()
 					uni.hideLoading()
 					if (res.code == 200) {
 					if (res.code == 200) {
-						console.log("芳华币>>", res)
-						 // 处理列表数据,将"积分"替换为"芳华币"
+						console.log("币>>", res)
+						 // 处理列表数据,将"积分"替换为"币"
 						      this.list = res.data.logs.map(item => {
 						      this.list = res.data.logs.map(item => {
 						        return {
 						        return {
 						          ...item,
 						          ...item,
-						          logTypeName: item.logTypeName ? item.logTypeName.replace(/积分/g, '芳华币') : item.logTypeName
+						          logTypeName: item.logTypeName ? item.logTypeName.replace(/积分/g, '币') : item.logTypeName
 						        }
 						        }
 						      })
 						      })
 						this.integral = res.data.integral
 						this.integral = res.data.integral
 					}
 					}
 				}).catch(error => {
 				}).catch(error => {
-					console.error("获取芳华币数据失败:", error);
+					console.error("获取币数据失败:", error);
 
 
 				});
 				});
 			},
 			},